gentoo resync : 23.06.2018

10 files changed, 245 insertions, 44 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index a134cb26d2a5..9f8ba9900384 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 954284bccce9..a46b6932d64f 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -19,7 +19,7 @@ AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c
 AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
-DIST courier-imap-4.18.0.tar.bz2 3202389 BLAKE2B 3889d8db1bca082b1a8a1f1c8f04996ddcdf30b46e2aa3d16b45c46987426f75721223fc63810884a8fa2d8f8daf60d85c2909321abf0ef27e77cfcd0dc3c531 SHA512 16dedefe8a43ef48f76388c65ee7f100aaf12c30d9610f4c85f9adbd1adab374f9a0978930e70c221b551a60ed3d804f6b5e87a979b549f5c8249c34af1a3a64
+DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
 EBUILD courier-imap-4.17.3.ebuild 6787 BLAKE2B 4f560cbb7538ff3c61ecc73705db27e46b3bd95673747c4322c7bf9043cc3c06f576b44d727048388542aa3c5473ee59c9f5461dea8df1e4b65136da46bfb79a SHA512 c8e3b52940b45fb492b2af63a1912eebd8ba48e996228953f1c59896f1630c16f2c9f448b369c033d2e2d183a1f1626c8d3556606ad3de97ec0cf26b23e5d8b5
-EBUILD courier-imap-4.18.0.ebuild 6764 BLAKE2B 10986db94919f747aee195359295f83aa4b632eaf0305fb2bd429baf1a0265619e68c5504a0fa024bb7e7a242875c32cb015f77c2246314daba440eccd193d32 SHA512 04b7b67a0cce4f9a29782e4de0c831c9103fb21e0b7cca0f8a1cbac4ea4c743d4c90431829a4f1f406a1b7398762d7f9938778e7d9ff0b2fa78fe4b5a48d77f5
+EBUILD courier-imap-4.18.2.ebuild 6857 BLAKE2B bca5cd6d8df1872c2b2ae789b585d2b1fd29d4c65dc1b0091b506c482f8ce29f492fcfe6a93d04e23e5879076252bb305ee59f2c6f1c1b876ef09570837f4e10 SHA512 9ef62d539a49e8c6ae329a92e45cde7d4f9b678c828762445ab4ab4b9c167e5e5462e6fa6da528564633ff302018192fbf8b64e932fcd95880e3fa2e2cbd38f3
 MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110
diff --git a/net-mail/courier-imap/courier-imap-4.18.0.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
index 8226e3abd98a..0c5927a7d1a2 100644
--- a/net-mail/courier-imap/courier-imap-4.18.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit autotools libtool systemd
+inherit autotools libtool readme.gentoo-r1 systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
@@ -12,8 +11,8 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 
+IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
 
 CDEPEND="
@@ -22,30 +21,46 @@ CDEPEND="
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	>=net-libs/courier-authlib-0.61
+	>=net-libs/courier-authlib-0.66.4
 	>=net-libs/courier-unicode-2
 	>=net-mail/mailbase-0.00-r8
 	berkdb? ( sys-libs/db:= )
 	fam? ( virtual/fam )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+"
 DEPEND="${CDEPEND}
 	dev-lang/perl
 	!mail-mta/courier
-	userland_GNU? ( sys-process/procps )"
+	userland_GNU? ( sys-process/procps )
+"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )"
+	selinux? ( sec-policy/selinux-courier )
+"
 
 # get rid of old style virtual - bug 350792
-# all blockers really needed?
 RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
+	!net-mail/uw-imap
+"
 
 RC_VER="4.0.6-r1"
 INITD_VER="4.0.6-r1"
 
+# make check is not supported by this package due to the
+# --enable-workarounds-for-imap-client-bugs option.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
+and remove TLS_DHPARAMS from configuration files or run mkdhparams
+
+For a quick-start howto please refer to
+${PN}-gentoo.readme in /usr/share/doc/${PF}
+"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
 	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
@@ -108,13 +123,15 @@ src_configure() {
 		die "sed failed"
 }
 
-src_compile() {
-	# spurious failures with parallel compiles
-	emake -j1
-}
+#src_compile() {
+	# spurious failures with parallel compiles, bug #????
+#	emake -j1
+#}
 
 src_install() {
 	dodir "/var/lib/${PN}" /etc/pam.d
+	keepdir /var/lib/courier-imap
+
 	default
 	rm -r "${D}/etc/pam.d" || die
 
@@ -203,6 +220,7 @@ src_install() {
 		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
 
 	dodoc AUTHORS INSTALL NEWS README ChangeLog
+	readme.gentoo_create_doc
 	dodoc "${FILESDIR}/${PN}-gentoo.readme"
 	docinto imap
 	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
@@ -215,17 +233,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading"
-	elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams"
-
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
 	# Some users have been reporting that permissions on this directory were
 	# getting scrambled, so let's ensure that they are sane.
 	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
-}
 
-src_test() {
-	ewarn "make check is not supported by this package due to the"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
+	readme.gentoo_print_elog
 }
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index e3db98b3b39e..1d6f48bc545a 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -4,17 +4,17 @@ AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb9967
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
 AUX mailutils-2.99.98-readline-6.3.patch 1321 BLAKE2B 061f3fbb554b2b8b9ed8452920c40ee6d9a93343b22aefcb550bbe03f9e0051ac8c770e58f44e4451ae63e3cca8350a09eed972dcf1db50bc6c40f1fb33a32a5 SHA512 cba6cd29af43b84bb9f13c6850756408e942b5cdf512f04582b3b3ae8e5532c615f8ed71cd8c19088aff4ef30f41861efab6e419d2300f99ad85f8b6abf30fa5
 AUX mailutils-3.2-fix-build.patch 2100 BLAKE2B a87e77ee7e8378fddb53d1001aafd01265fe1379af6563d20d2d03b7dc8caf514b3db1d489e8b99a5d7b0aa39bf3b7498b6ff7c4d00a9452850a03075de5fb28 SHA512 4ec7dc7c10dfed4862c0ecb7f9b5225abc957d03760f4cfb1982e7d3076244b45ef78b85b064f3aba925a09c67ab5103b37fefd4a8f9d45efefa9d481bb15505
+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.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.2.tar.xz 2795512 BLAKE2B f906811dab0d9908b91dd6082298218af7fc592fde142393ab6cfc60e7d007bcf3b472424a2442b208f7e5043e6670643b0975b41593f8667f3765c65388f1cd SHA512 48499d64da65653f996257bd920ee6574840ce9872476425c499d2af6dda5f2cd88a6dc89affba5451ab28c347308a2ae1b53ec40679289d63d74775cd722f96
-DIST mailutils-3.3.tar.xz 2618632 BLAKE2B 9896f1b282a1b5ce37d0419574f529efee7cf78911f1bd288e445cd28c9c60ebbc1c3291fb9e40aa2dd4f94cfbf10ad2bafd5586e92504738400abd05706caf1 SHA512 ece4e59ca46e287b8e69e45b9ca1207f9a7ef450ea009212ed9284d5aceaeafe64b0ee6333f42c1edcea2a2c45d414b8436e49bf342938bd78b7157a751bce9c
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 EBUILD mailutils-3.1.1.ebuild 3575 BLAKE2B 27de93350eca9d9ca3c8503ebc3b78ad1661c5b09458cb16835e84c8848b6d818d965ba0c4c1ebaaec3a87bc714c13a056598a1f079da59cf98619ee3b41b610 SHA512 3fa3501b885b254bfaf86786d67a3177f0756cb0346ba630dc9b902c851ceb708abce1057d326de769704ff50d713859f0280433b384a6f17b016a4045d05570
-EBUILD mailutils-3.2.ebuild 3572 BLAKE2B 04da6beb1e2ea517b17ce90ddd042d3444978229405462dc90f96966ffb94874829006c76343e8285b70c0128c4955fd6862148bdde8f2f5c157b7eb041e816b SHA512 eb2de61804c2e6da6a6c704f7df7e88b6ab8682b1e023e2f47661c504a38bea4fbe391fb4fce462f6674e1de645422c0a991f4d906635d41163dd9ac7874ad03
-EBUILD mailutils-3.3.ebuild 3475 BLAKE2B 4afce522ea4f569e71d5a2347398ff3b2bf60ec73642aba33ad521dc1033ac34832741222435efc633dbef67d1a916a8136ce1f085823a72c0f0336f01d9a5b2 SHA512 c1c63289f55a89f7ba9a547f6a7ebf32fc7bca2de93f0f208e0123b6c5d431b09aa40171a67240aebaed572fb0e0d8d2f3cfd57c9cc0d2794b0dc119aa0489f5
+EBUILD mailutils-3.4-r1.ebuild 3530 BLAKE2B ee9410a41c7e34e425e6c40c09e244c2d739b4cea8063f35090cbbf38ef14815be43de60d4c96b4856c5979f9f7ea0589d16f9c4db11837d2650c76f41fef4d8 SHA512 d08a536c05c6301555750e5ea4139b524aa1f71b99fd1b25b462c710695a3b976c1267a05448386d773650fba524cdc79c4131cb6dc44c0729cc3bfe5cb0e4a6
+EBUILD mailutils-3.4-r2.ebuild 3535 BLAKE2B 16477c13f45fb15171bdf49a553a269f68e0c001fec7bc75b551cf6b3eb19fec6506d02f2f8a7498c4b80b9241cedc10882f54ebe6d0f7b9ca985eed8c726c6b SHA512 b4c430051d75fc1d02feaff216a995962228392a4a75eb40a2391c69a74c3c46dd42e42624453a3f5adfd9a57b200cedd30ec57a72524c74ea701aa07bf5549f
 EBUILD mailutils-3.4.ebuild 3480 BLAKE2B efeab718e516c9c89cf6c638b75d85fb15f39fc11fa9da4f4e22289565531a20c2bd1d7665f9c4621c5d19be7ebb8c7a78e624263a7746e33159c8763582d019 SHA512 7f6b384b5a0a227ec4fd18f5cb4f9797b588013d0897e5d62d878e6e6e703c84a5d7a06f164df38a7c8faf3b3aae8994b0e13171acd6d704eab891cc0f871cc7
 MISC metadata.xml 598 BLAKE2B fce383bd86c8e43d7b9164abae6127ddc98b606b6a5e4afd17826f6a3fb683f92120d8c7877d250196bab51bfb37ab33454d3cfaeffd0b7a69a001481510f9a4 SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7
diff --git a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
new file mode 100644
index 000000000000..919b6619e5f1
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
@@ -0,0 +1,70 @@
+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
new file mode 100644
index 000000000000..0e52fae20c1b
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
@@ -0,0 +1,122 @@
+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/mailutils-3.3.ebuild b/net-mail/mailutils/mailutils-3.4-r1.ebuild
index 6e414782ed7c..c52787aad2c6 100644
--- a/net-mail/mailutils/mailutils-3.3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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"
@@ -29,7 +29,7 @@ RDEPEND="!mail-client/nmh
 	berkdb? ( sys-libs/db:= )
 	bidi? ( dev-libs/fribidi )
 	gdbm? ( sys-libs/gdbm )
-	guile? ( dev-scheme/guile:= )
+	guile? ( dev-scheme/guile:12/22 )
 	kerberos? ( virtual/krb5 )
 	kyotocabinet? ( dev-db/kyotocabinet )
 	ldap? ( net-nds/openldap )
@@ -62,6 +62,7 @@ src_prepare() {
 		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
 			sql/Makefile.am || die
 	fi
+	eapply "${FILESDIR}/${P}-MH-testsuite.patch"
 	eapply_user
 	eautoreconf
 }
diff --git a/net-mail/mailutils/mailutils-3.2.ebuild b/net-mail/mailutils/mailutils-3.4-r2.ebuild
index c06e69e20eee..f7d379b8b042 100644
--- a/net-mail/mailutils/mailutils-3.2.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,12 +8,11 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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"
@@ -29,7 +28,7 @@ RDEPEND="!mail-client/nmh
 	berkdb? ( sys-libs/db:= )
 	bidi? ( dev-libs/fribidi )
 	gdbm? ( sys-libs/gdbm )
-	guile? ( dev-scheme/guile:= )
+	guile? ( dev-scheme/guile:12/22 )
 	kerberos? ( virtual/krb5 )
 	kyotocabinet? ( dev-db/kyotocabinet )
 	ldap? ( net-nds/openldap )
@@ -56,16 +55,14 @@ 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
+	eapply "${FILESDIR}/${P}-MH-testsuite.patch" \
+		"${FILESDIR}/${P}-fix-endianness.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
-	# bug #612712
-	eapply "${FILESDIR}"/${P}-fix-build.patch
 	eapply_user
 	eautoreconf
 }
@@ -108,7 +105,8 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	insinto /etc
-	doins "${FILESDIR}/mailutils.rc"
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
 	keepdir /etc/mailutils.d/
 	insinto /etc/mailutils.d
 	doins "${FILESDIR}/mail"
diff --git a/net-mail/tnef/Manifest b/net-mail/tnef/Manifest
index ae4b1293f6f6..07156c9e3d2d 100644
--- a/net-mail/tnef/Manifest
+++ b/net-mail/tnef/Manifest
@@ -1,3 +1,3 @@
 DIST tnef-1.4.15.tar.gz 4650572 BLAKE2B 3feb389af7128dc197e919c002039ac7747aa49ca0a69bde2f5f35940c1d1a340a1c2557ac14f1109a0487dc45d7151271b18cdcac2ce8daf38c302608c26c83 SHA512 51a8c3abd99065fda59ab4129b1a6ca4d58919bfe1b8b10951787ddb007fac69a82d93b7d2a7f1799a9b04f531960f3e1bb7424bcb7cd831b1eb3fcdfad0e720
-EBUILD tnef-1.4.15.ebuild 454 BLAKE2B 061ed0ada714ca60cb9ffe35a5d61566e95ab40fd692e4ebe433e655316b8725c3beb807f209ffb049d6d8f70fa017a317b330278f9591224e0cc202af5d747c SHA512 009dd7688c0511925fd4a47366de2e19efcdad7a543d0e8f357a894aacaef6665af8356fc4e9041f4ba72ce777154630ac45e153a52406cc440d704fccb31bc9
+EBUILD tnef-1.4.15.ebuild 453 BLAKE2B 6d2a35f40637d70d92a4c6877a417cb9fa4889e5727c31d5fdff3ed4cf7e1d9697b52e9050c7fb297e7375536d4606c691d46e515627a65a12f764df27db7b5d SHA512 0ae6ba62420ff40a0af212df880f082bc8e6f3a62ca5685a18966395b775da62de13262eef559b709b75e9516ff25366c5e3f3e7be05e0752e53617433cfb8b3
 MISC metadata.xml 318 BLAKE2B a1ad80898c99b4ecfc7993c2a897616555ac1f74e7ec5e06b0b7c6e023105271240eef10a6d3de05fa2188adf7f70e1b5961c971232cf1bdf86d9f3c23dec53d SHA512 e485756ad4674420d72bceb57b6e5145a7e46f2c7e4d2f5e60191af658dd7e2b1cd58af2a9980f5d1b8bb68b0fc22488349de6e3979f7ffb68cffcbb6a85111c
diff --git a/net-mail/tnef/tnef-1.4.15.ebuild b/net-mail/tnef/tnef-1.4.15.ebuild
index 8db4423c7898..9ef7a269a4ba 100644
--- a/net-mail/tnef/tnef-1.4.15.ebuild
+++ b/net-mail/tnef/tnef-1.4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/verdammelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 
 src_prepare() {
 	default