gentoo resync : 03.03.2019

10 files changed, 99 insertions, 333 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 442b83662e21..1da74dc569dd 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 75f5f8956bdd..009c3d50fce0 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -21,5 +21,5 @@ AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d1911
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
 EBUILD courier-imap-4.17.3.ebuild 6794 BLAKE2B 5192299cd016549438abe0ffb2b7d92d50a8e596e9a1d9d4d9a3485550973d8a76aa3f9fa3c5752811ebb93e8ea50cd81e8bd50f9b8833c6fc74880babaa418e SHA512 103e22a47b18ea7a22a832505e9f540d28af0e9e5dc92205ff58a443689f96449c6597a62dc8ec35e48f4823bc522ce46a53b6f257df2533e2e777cba0ef46c4
-EBUILD courier-imap-4.18.2.ebuild 6866 BLAKE2B a97da84f22269460677df1ee7fbb3d8e5dd758dba784bcaa629b6a07b62580ed29b77d52c27eb8a6ff6924317c45410b7b546a36ff6f31374e0940b1297aaac6 SHA512 c9961def6f8e6b603f82deb713521fb541b9840535dde17e15be9396ae63f965d46d7dbeb952abdc5ab7a8d5cf05ef4a19f3635ff59405e51f69ef718bda06eb
+EBUILD courier-imap-4.18.2.ebuild 6862 BLAKE2B 3c90f93ea7dc0f096dfcee77c8c9ca8a776b044e184e7c85082d5b23162aa0bfcb0b5356154bdc6e87d12eea35d5df14b0b73db34a441c3cb2d1b936e36f0a65 SHA512 54130db2d991717f584272291ed385991a9434c6337daaaa52ca896f811c319a77c8b7faae9482eff71978bc87aad610b49b98138b354ad7f2b3b369156e3361
 MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110
diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
index 93d001e33010..67527a22a9c0 100644
--- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
 
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 01663343945c..893c925ee852 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -2,22 +2,21 @@ AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c5410
 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-2.99.98-readline-6.3.patch 1321 BLAKE2B 061f3fbb554b2b8b9ed8452920c40ee6d9a93343b22aefcb550bbe03f9e0051ac8c770e58f44e4451ae63e3cca8350a09eed972dcf1db50bc6c40f1fb33a32a5 SHA512 cba6cd29af43b84bb9f13c6850756408e942b5cdf512f04582b3b3ae8e5532c615f8ed71cd8c19088aff4ef30f41861efab6e419d2300f99ad85f8b6abf30fa5
 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.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
+AUX mailutils-3.6-python3.patch 2095 BLAKE2B da7e61b51a9682d8f0387085655af9f359729f41e71fd467cd84c5c2854b85e860680489215b69d307b829d4afec39c9de3e58e25f8bc897bdff419324842c78 SHA512 ff7eb7b8feb484ffe0caf3de347bc31e4c47a01dd27e5513ca6d54e0842e1cb41140395668fd57818b9e7acb7e1789068362e2fb63e51985f6ad03baca3b9907
+AUX mailutils-3.6-underlinking.patch 368 BLAKE2B d578b46b45bba39fe8b776abfa4394e3adc10c2f811ed4d20fe7a8cf7b2442ebd040dd8a8c5c9023e1f9b635e252cade01ecb08b898bf8e4e2da97e5349497ba SHA512 a958be77edbd01af80f824c70b5f85fde526eadfd58db2476317d44b1d48fb2c2a90c84e49204a84f9efee91c51c33275f6c8254eecd84fa2681c84230b42173
 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.1.1.tar.xz 2759000 BLAKE2B 146dbc17f222f5f6293c88861fbe75679bde9497d1e9db577441290a2946632ee946ba726cd618363c3f6c1e3bfc87cbd9e94f701ca90f794e6182370bc35ac3 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.5.tar.xz 2742824 BLAKE2B ca14597114203234912cf4cfaa4c63e682561deb28d9d0825373c69de267c215d12b9db662cfd60024228e119433fb40a136d65cfd04385f881ba4b0384c8328 SHA512 6aa2de352be637295a8ab53207a8065f5c10655acc299ac0a2190937ec4decb515ac1044c9a7465b08764ca45be569012cce1046b40d748f6e4f31644f056a53
-EBUILD mailutils-3.1.1.ebuild 3578 BLAKE2B 332f463f7aebc4b81e43b3f2670d7682a9a26561aeda29161a31a78f118bed64818098ce35b7863d5e80f19f089fec3542755d38e889746e7687d5bf733a1c80 SHA512 880368f9903af459b6c5294eef802538a22c447b3a35b0935056407c2775da9ad94d21bded9926c849cf87da99fb36121c8571352827dafa565e922db6a56bcf
-EBUILD mailutils-3.4-r1.ebuild 3533 BLAKE2B a22b0983f277012c897b44186ffdc00f2b16b137a31fb93d6c9aee7e7c1d6d5a1a6b98bf72adbb925112513596af6f19b0016f1fc410d2755c1e00d76ee26787 SHA512 224984417e6597fcc462b9bef5fe4394d33ded19c8c5b05edfeaf46a2813c31450042e96ccc007674e85b779805e4f2305dd10d04fb538810ee333fcd5b852fe
+DIST mailutils-3.6.tar.xz 2813412 BLAKE2B fa2cde98287f84745c1ccc213d2ee824857b9c64d493677ed817ae53d49576382d22784ad25faa644ca43528637ed629aa4e9a78a3b1040fd51658e54b369399 SHA512 f07b8dc570abf345d45439f4994173d2415f94d72291aac46528842e339aaa7925baf776ccfc8f8901cf0e08a13cbfdf09596dd6c448bf012af002ef5ce2fe0e
 EBUILD mailutils-3.4-r2.ebuild 3535 BLAKE2B 2270b2a23bbe9b55950a23415f5c3983f90e608d486207d88e5fa7ad468711372b8343e0532c5aa7777fee3c0ee8bea0509042db690999ca3cc18f0f3c9bcdbf SHA512 ae1ab694f81c90434083a2d180997c8397f9c859e1faa2585db9c8ce70e3f298c7ed78a744bb5a589b8a4773675f25b12f407c6583926a26b8204cf686e2d59e
 EBUILD mailutils-3.4-r3.ebuild 3665 BLAKE2B 1a2a62f7403ad10f534fdfdf9898fb9e24467450fbcad54d0f3c0b7d4a289ed36d400cbf24a11ea92acc2e8f6a8a621dfbb7cebbb55b5d6c246ced31d6af0228 SHA512 1cb84032c3c433bad161c8412f5138719ac8a311f4e904b74a653ce0fbaa7f176f8dfd7cfdc676060a35c7a7808059a8f744949d7b7a1913d1f48d2766db2219
-EBUILD mailutils-3.4.ebuild 3490 BLAKE2B 0f846d498d81d9e66f00c69b8bbef2817e6c8e5c0c3e9d99c54c46224ecca578e538111b6f1b1e1728252d676e0671e033fec77b05c68174ca8431cd83be5208 SHA512 1d7796825701e9c161faeeaf762a6bac0a9385221b886ede431d59b556bf6fe9a765f1db6fe2555d368ac69c63ac5407caf7c858a74fb836b8bc4d90590f3100
 EBUILD mailutils-3.5.ebuild 3434 BLAKE2B 6d9636f7562041f9c1fdf53e532812035912595f70c98460d3160e0dd808ae88e6727a0808aef674ce09f3bf022f0e50aace4eea6cfce92c38b3de59464a1a71 SHA512 7ff7fd774b22b3fbba05bf98511a98adac854803b86579613dc1d82eb1075c282989d420ba9658408f2b1fc721511fa95d6dfc792470404186e3641d3798e0d8
+EBUILD mailutils-3.6.ebuild 3660 BLAKE2B bda538c07797453de750ed28b1dbcf2bfdd4869378444c6a4c5c74df80d4fbd9e14a7c6cf872eacd5c3a1fa0601442803407290d5853f8c8f279f220be5c562c SHA512 e246a894134e92d7c579d1f00a52608dc79d1420886c7ae3669ccd77eb427f66ec5e7e7107e193916e852c6fcdb65ea1fc20e390522e4f1a6de8a34b3b3a7599
 MISC metadata.xml 598 BLAKE2B fce383bd86c8e43d7b9164abae6127ddc98b606b6a5e4afd17826f6a3fb683f92120d8c7877d250196bab51bfb37ab33454d3cfaeffd0b7a69a001481510f9a4 SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7
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
deleted file mode 100644
index de9a487aaaf3..000000000000
--- a/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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.6-python3.patch b/net-mail/mailutils/files/mailutils-3.6-python3.patch
new file mode 100644
index 000000000000..cad46d006a2a
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.6-python3.patch
@@ -0,0 +1,59 @@
+From 4e66a6a9e5f5696d60f7df875175f2e0ad8f7376 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Sun, 24 Feb 2019 22:56:21 +0200
+Subject: Bugfix
+
+* python/3/libmu_py/mailcap.c: Fix leftover uses of PyString_FromString
+and PyInt_FromLong.
+---
+ python/3/libmu_py/mailcap.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/python/3/libmu_py/mailcap.c b/python/3/libmu_py/mailcap.c
+index 6db1770..fdb5b71 100644
+--- a/python/3/libmu_py/mailcap.c
++++ b/python/3/libmu_py/mailcap.c
+@@ -91,11 +91,11 @@ api_mailcap_create (PyObject *self, PyObject *args)
+ 
+   status = mu_mailcap_create (&py_mc->mc);
+   if (status)
+-    return _ro (PyInt_FromLong (status));
++    return _ro (PyLong_FromLong (status));
+   status = mu_mailcap_parse (py_mc->mc, py_stm->stm, NULL);
+   if (status == MU_ERR_PARSE)
+     status = 0; /* FIXME */
+-  return _ro (PyInt_FromLong (status));
++  return _ro (PyLong_FromLong (status));
+ }
+ 
+ static PyObject *
+@@ -183,7 +183,7 @@ api_mailcap_entry_get_field (PyObject *self, PyObject *args)
+   status = mu_mailcap_entry_sget_field (py_entry->entry, name, &value);
+   return status_object (status,
+ 			status == 0
+-			  ? (value ? PyString_FromString (value)
++			  ? (value ? PyUnicode_FromString (value)
+ 				   : PyBool_FromLong (1))
+ 			  : PyBool_FromLong (0));
+ }
+@@ -199,7 +199,7 @@ api_mailcap_entry_get_typefield (PyObject *self, PyObject *args)
+     return NULL;
+ 
+   status = mu_mailcap_entry_sget_type (py_entry->entry, &value);
+-  return status_object (status, PyString_FromString (status == 0 ? value : ""));
++  return status_object (status, PyUnicode_FromString (status == 0 ? value : ""));
+ }
+ 
+ static PyObject *
+@@ -213,7 +213,7 @@ api_mailcap_entry_get_viewcommand (PyObject *self, PyObject *args)
+     return NULL;
+ 
+   status = mu_mailcap_entry_sget_command (py_entry->entry, &value);
+-  return status_object (status, PyString_FromString (status == 0 ? value : ""));
++  return status_object (status, PyUnicode_FromString (status == 0 ? value : ""));
+ }
+ 
+ static PyMethodDef methods[] = {
+-- 
+cgit v1.0-41-gc330
+
diff --git a/net-mail/mailutils/files/mailutils-3.6-underlinking.patch b/net-mail/mailutils/files/mailutils-3.6-underlinking.patch
new file mode 100644
index 000000000000..512a05f3a313
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.6-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2019-02-26 17:11:29.398115222 +0300
++++ b/configure.ac	2019-02-26 17:14:13.733899654 +0300
+@@ -985,7 +985,7 @@
+   AC_CHECK_LIB(ldap, ldap_bind,[
+    status_ldap=yes
+    AC_DEFINE(WITH_LDAP, 1, [Define to 1 if you want to use -lldap])
+-   MU_AUTHLIBS="$MU_AUTHLIBS -lldap"],
++   MU_AUTHLIBS="$MU_AUTHLIBS -lldap -llber"],
+    [status_ldap=no])
+ fi
+ 
diff --git a/net-mail/mailutils/mailutils-3.1.1.ebuild b/net-mail/mailutils/mailutils-3.1.1.ebuild
deleted file mode 100644
index b07d4d2835ea..000000000000
--- a/net-mail/mailutils/mailutils-3.1.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~s390 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.4-r1.ebuild b/net-mail/mailutils/mailutils-3.4-r1.ebuild
deleted file mode 100644
index 5139756cb96f..000000000000
--- a/net-mail/mailutils/mailutils-3.4-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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:12/22 )
-	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
-	# 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 "${FILESDIR}/${P}-MH-testsuite.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
-	# 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
-
-	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.4.ebuild b/net-mail/mailutils/mailutils-3.6.ebuild
index bb0e216c9319..7360f6552ed9 100644
--- a/net-mail/mailutils/mailutils-3.4.ebuild
+++ b/net-mail/mailutils/mailutils-3.6.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+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"
 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 ~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 \
+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 ssl static-libs +threads tcpd \
 	tokyocabinet"
 
 RDEPEND="!mail-client/nmh
@@ -28,17 +27,19 @@ RDEPEND="!mail-client/nmh
 	virtual/mta
 	berkdb? ( sys-libs/db:= )
 	bidi? ( dev-libs/fribidi )
+	emacs? ( virtual/emacs )
 	gdbm? ( sys-libs/gdbm )
-	guile? ( dev-scheme/guile:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
 	kerberos? ( virtual/krb5 )
 	kyotocabinet? ( dev-db/kyotocabinet )
 	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	nls? ( sys-devel/gettext )
 	pam? ( virtual/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 )"
@@ -47,22 +48,23 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd )"
+	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-python3.patch"
+	"${FILESDIR}/${PN}-3.6-underlinking.patch" )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	# Disable bytecompilation of Python modules.
-	echo "#!/bin/sh" > build-aux/py-compile
-	# add missing tests so that make check doesn't fail
-	cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
+	default
 	if use mysql; then
 		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
 			sql/Makefile.am || die
 	fi
-	eapply_user
 	eautoreconf
 }
 
@@ -92,15 +94,18 @@ src_configure() {
 		$(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 \
-		--disable-rpath
+		--disable-debug
 }
 
 src_install() {
+	default
 	emake DESTDIR="${D}" install
 
 	insinto /etc
@@ -123,8 +128,6 @@ src_install() {
 		newinitd "${FILESDIR}"/comsatd.initd comsatd
 	fi
 
-	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
 	# compatibility link
 	use clients && dosym /usr/bin/mail /bin/mail