gentoo resync : 19.07.2019

17 files changed, 343 insertions, 426 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 79af4b6e01eb..2c06060d56b5 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b26fb0fa4e5e..afccadaba5d9 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,15 +1,19 @@
+AUX dovecot-no-log-error-tcp_nodelay.patch 1374 BLAKE2B c665fdbd0d54dc8ddac8f4891197dfa813b39280ab8157a82a3946dc4284fb01710dd4fbc4c3961df4003d8027faeaf8e407223fbbdf0989145254aabb20e56a SHA512 48dc102d4d8e49e1cdfb0f0dee5ca67739f260f5467583c60d5fa6e3de8031da29a830ce56b8f786d6a9568b968bc64707031b193fd40af90c9fda58e152fd40
 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
-AUX dovecot.init-r6 1573 BLAKE2B 7565a20d0677d6e380756627360e65703cd6a29982cb7e1c1d6ae51fe99ec33c00c1f04c471bb5741321369b8c0e4767eb69a83b9d38e2789bb3d7a79630ea04 SHA512 488a1213514f066fdc7b97e69a1a8336eb4c83054d138d94a63bc733a2163d0b316a6485bf1dde6c4caae92c7dc8d9bd58a4c723b6c0e81d4b130ebd91875baa
+AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
 DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a SHA512 99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd
 DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5 SHA512 47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35
 DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc SHA512 21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94
 DIST dovecot-2.3-pigeonhole-0.5.6.tar.gz 1854287 BLAKE2B a26edf2a298d8c3de0d9977d56583bd2e0933495c5f554871a38d7b9e31701ebf3587d221c5ec398721a9c34816918c41b069de39c13f879334f9776fede1a17 SHA512 998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20
+DIST dovecot-2.3-pigeonhole-0.5.7.tar.gz 1856779 BLAKE2B ce9fe5570f058ceed6ef5ea5f732b079e7924bcdc8910cb13e8686898b654705ea006286cbb19105975f83d6c96a0256106b6f0ec10f561cd6040311be2087d8 SHA512 f58098ae13b41a6378080340240928083514a541f2fe3c8f516853455ab27635e0c47587a101aca5eb4e97ec8afe6a5dd5360c46e956b009ae971316e491f1b8
 DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7 SHA512 e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a
 DIST dovecot-2.3.5.2.tar.gz 6953228 BLAKE2B d3634ca0621349ed82c552b416bd633497ce9e4bdd5df30c2e35da1ab70a5934e2dda2b88ac6bbebeebc23918d9dcfb7a0976b1b51fba5eefd14327b2b2ea734 SHA512 041ec1c33c6accb5c89d96d7ab2f7dd59795f496c17faea1906e7977983e4a387aa855a238376515c09532731634d9d42e6d6be22659062855241847ea0213d5
 DIST dovecot-2.3.6.tar.gz 6980135 BLAKE2B 59ce625aafb96092cbd687aa0d5ccc3d7697228606978efa89bbf50e608915e381abb79348197aaf3b3fa046618bcf88acdc77420f9f028035653b8cb9843009 SHA512 ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
+DIST dovecot-2.3.7.tar.gz 7074117 BLAKE2B 30aa02cc1dbd83f2ecc65f7b27543d3a1614c857e3d432454f13e4108cb4a15fc37c8c07835a2eaeb6b03077066fba2ed947e30f033926f52213a7446dd096eb SHA512 a8828b6cdf0ada0d317a4606d88370f1360415dadcf0f3a6f157d76396bcaf7379d85114d9747011b429ee94bee8eff7de8d0b6cf25e2618af15fdfba8ae4508
 EBUILD dovecot-2.2.36.3.ebuild 8599 BLAKE2B ce60439de2676ad168bbb8355f61072019ea6ad4ef9e357b401bfced19b4d0d0f842926d83cf8e2348db460b1bb3dc7a5537b457835eedfe16e03a024fdfa65c SHA512 ed5940edaa0c1bf67065354f9e433901bc556a2c3db071d8c9d1c6a9ed02b86f151729c6ec5ece5a2924662d3ed8eaf1df19ce1979d325c03b932751b3921afe
 EBUILD dovecot-2.3.5.1.ebuild 8783 BLAKE2B d09a7e8b2545522a8f48939f46c586e537abcbe683f0ff790d82aae7d9be942dad171b5f6d94f3c8e9d85f1d0096f9c487cb4538297d0356fa20d2dc0f2abf76 SHA512 9b2a1a7dfedc3fb372b712ca0c0231ff2077632a42ce9722c4d369ffdaabd61b538e34da5523c5902f7a0f2d291d17c3739a0acfe19dba8b67e234b9df6d7b50
 EBUILD dovecot-2.3.5.2.ebuild 8784 BLAKE2B b8dc0bec0b0164b00cc070080169f018ed6c008ded304de3434e16fcf02bc9c3acdd1bf97d8cef0d83048b951fe1904a3cefccadfc3bbd4109299e7dc4d0991c SHA512 f54e6a872aac3bf38cbd9e9a3effec363e40483e9d2db022d156a7993a28c96a3470648cf059d00a165ecd1dff760df65d409b8c9658cfe9c82da0844df92956
 EBUILD dovecot-2.3.6-r1.ebuild 8717 BLAKE2B 5e61b8154648de4e65b5bd9601544bd032c2e8a03f7259654f819b6fab22379ddfac701930ef079e14f7ccaa7c08c86042c419281ce96baeb018f24686bbabc9 SHA512 264191a2fb2d79cd57e800d7c95a64f3c0677901941a7c3ace92cbad3e8f7c6cf812a5b68de78993715c7bc2793c809733510145c103020d6a5f7f555fc9976d
 EBUILD dovecot-2.3.6.ebuild 8782 BLAKE2B 0f108ca6de24026c9220d8ab60001726256bf2a39361fbe22b67e15ca8c1f9e1dc30868296045985f66ec656cb1903347efb96fca3a40af41c220c51884b6f66 SHA512 c3e032b287e03e70c50f8ffd28dfcc0cad977a76dc173e20b7ca801190b5f1747dc08b1a400e553853806c907ef3351b2d0956ecd645c05017ea2ea7d59b8602
+EBUILD dovecot-2.3.7.ebuild 8769 BLAKE2B f5755060fce977b97b35aab3b365375fca1db87bccb4a53050fc2075612084205f901cf0c5867132f586f7552743bb0686186e4b5f4be90c99efe42e014e7c57 SHA512 9203a7f0720cae6feb7cf30fa5fbfd7db4fa9759df1f9f892d39d619d7dea20f06710e801818c8977403d2934499998a87b98f67caa79359caf1393d98a5f4f0
 MISC metadata.xml 941 BLAKE2B 8432d32315ba8c4ad55cdbc6cdfc85b9cbd2aab5928f8f3fbaa1e33093a272ee36abfaeb8d4e6f2a7658bdf9a9f481efe3ac18e5b5b901c74addc63979bcc312 SHA512 f8347117eb6039d0340ab53e0ccd82cd269a3f50d2747a780ccfee26b6e598347337f73b75c1e6f4f814c86918c4d0325c4c784a04a86b3d66ceb58bfe94d98d
diff --git a/net-mail/dovecot/dovecot-2.3.7.ebuild b/net-mail/dovecot/dovecot-2.3.7.ebuild
new file mode 100644
index 000000000000..16c5e7137f09
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.7.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools eapi7-ver ssl-cert systemd user
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.7"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	suid? ( acct-group/mail )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
+	"${FILESDIR}/${PN}-no-log-error-tcp_nodelay.patch"
+)
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	elibtoolize
+	#eautoreconf
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX%/}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch b/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch
new file mode 100644
index 000000000000..3a2acd74fb65
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch
@@ -0,0 +1,31 @@
+diff --git a/src/lib/ostream-file.c b/src/lib/ostream-file.c
+index e7e6f62d12..82bf729ac0 100644
+--- a/src/lib/ostream-file.c
++++ b/src/lib/ostream-file.c
+@@ -333,17 +333,17 @@ static int buffer_flush(struct file_ostream *fstream)
+ static void o_stream_tcp_flush_via_nodelay(struct file_ostream *fstream)
+ {
+ 	if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) {
+-		if (errno != ENOTSUP && errno != ENOTSOCK &&
+-		    errno != ENOPROTOOPT) {
+-			i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m",
+-				o_stream_get_name(&fstream->ostream.ostream));
+-		}
++		/* Don't bother logging errors. There are quite a lot of
++		   different errors that need to be ignored, and it differs
++		   between OSes. At least:
++		   Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT
++		   FreeBSD: EINVAL, ECONNRESET */
+ 		fstream->no_socket_nodelay = TRUE;
+ 	} else if (net_set_tcp_nodelay(fstream->fd, FALSE) < 0) {
+-		/* We already successfully enabled TCP_NODELAY, so we're really
+-		   not expecting any errors here. */
+-		i_error("file_ostream.net_set_tcp_nodelay(%s, FALSE) failed: %m",
+-			o_stream_get_name(&fstream->ostream.ostream));
++		/* We already successfully enabled TCP_NODELAY, so there
++		   shouldn't really be errors. Except ECONNRESET can possibly
++		   still happen between these two calls, so again don't log
++		   errors. */
+ 		fstream->no_socket_nodelay = TRUE;
+ 	}
+ }
diff --git a/net-mail/dovecot/files/dovecot.init-r6 b/net-mail/dovecot/files/dovecot.init-r6
index ad096bff7502..cff64bee4995 100755..100644
--- a/net-mail/dovecot/files/dovecot.init-r6
+++ b/net-mail/dovecot/files/dovecot.init-r6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 extra_commands="checkconfig"
diff --git a/net-mail/fastforward/Manifest b/net-mail/fastforward/Manifest
index ab149895680d..8238dd7c8f21 100644
--- a/net-mail/fastforward/Manifest
+++ b/net-mail/fastforward/Manifest
@@ -1,4 +1,4 @@
 AUX 0.51-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b001353b1f5cdc8b5f73d507a8edab3f525b4c1407c02c0c0d11e09e96eaa5d041217da23f92aaef6c03e1 SHA512 1d4c1abde8eb0b4d6dd2254be29b685c922265ededa02a19010bc487e2e2013ef2df9a86a5dd797e0d7a30567cc18ae72324f2a67558633aae76262b2a9681a1
 DIST fastforward-0.51.tar.gz 40659 BLAKE2B ec4fe86431fd2a6622f721cbb0c5417b36e2a12bd121e5138ed7b7a311e9359bb9a7866a8bc4515d370873c7c26a85d4f0a0400bf3692a2a6dc544c584bef688 SHA512 7206f72dc7bb42d7e0cc63980eda7bc2b93c7ca6639db810f6d28476ab58d3e4bb6e441f4eef2149c5fe933c2f9effe2f2b3101d02cf9f6e922a678e7466b132
-EBUILD fastforward-0.51-r1.ebuild 951 BLAKE2B b8f2c587ee9ccabea7d27163a36ace7347055694b1d2a8752b39378daff6436c9b4bf684683cac45fc578e3861888c58bd875da1cc8016afd6c925a25ed93589 SHA512 7b240425996a2954b9eeac481f1a56d084d979e1f0a006bf1ffb28c1117585e9eb70ce68ea6a728cc87b7d08ffb7ede97bdd261ab9a9fd5de2cab4eba7476cab
+EBUILD fastforward-0.51-r1.ebuild 948 BLAKE2B 3fcac0cba656ac33719de240bfb00200b56d3abd4dcd546fb2075c2feef896a8b602a215d7af467d779122069355d6f26fa3304076a5d7de5a3d2fc8b45a1e1b SHA512 fc9b1a80f071bddf45729b8f34d750f30b48da7dcfdf24eb9e09af36c2ede9057c772f67fbdc76be0dae3fd51da0c87d7d6f7b77296f5a99cd6610c23003af73
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/fastforward/fastforward-0.51-r1.ebuild b/net-mail/fastforward/fastforward-0.51-r1.ebuild
index 1db0eaddaa31..6aea058518e0 100644
--- a/net-mail/fastforward/fastforward-0.51-r1.ebuild
+++ b/net-mail/fastforward/fastforward-0.51-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
+KEYWORDS="~ppc sparc x86"
 IUSE=""
 
 DEPEND="sys-apps/groff"
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index f0295da2f3c4..2ac172ef50dc 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -3,12 +3,8 @@ AUX 0001-Use-loopback-IP-address-rather-than-name.patch 2100 BLAKE2B c949840e8f2
 AUX 0002-Fix-jobserver-unavailable-warning.patch 813 BLAKE2B 092eaecce7cf8beccb8e314fb818a3af4e5009009ed4d0d1fdfc1a526621f1df386c021d57ec02d6af2b4d98f1738875f054cf32e9a5f4fca310c282f85e6b0d SHA512 f1ffce7811f68e404118ad0147269c8d959d748e2e368d66dfe7eae5e995f1c405daf6ba6f45e9122c7aa249da190e54cd54b7c732a9d122e0c604454a53fce4
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.23.7.tar.gz 692230 BLAKE2B 79e81bde02546589c867d636fd30453beeecfb2a1e16cd512613de96f60674605765d53b52b8ab7479413b38d5db50d684a182139c62888c9dd0551f6eff8dea SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522
-DIST notmuch-0.24.2.tar.gz 709272 BLAKE2B 25ef9db21a9fb009db89e472e06d871e92efc5223ef3edd91716db2a7edb5b8d39df000f540aa30762fe64e05fff221158040b2869fb618c89f9fa36cbe1757f SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
 DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8
-EBUILD notmuch-0.23.7.ebuild 4573 BLAKE2B 10251e488d1b9bbf03798726d168cb746178d6eb43ab8280dd8280d962300a32505e8e0a79aaeefc3b6a255830bcea1ab1a26e95a8d031b10a9379a0333e72f8 SHA512 437dfdebdb2f4105e1378c3202b77dee7c2443d59988c7dc8eee45a905012fecdfbcd90ada3a2fcb1099a7b8bd5febcc1b266f81b2fd5fe4658e5b4382144b5e
-EBUILD notmuch-0.24.2.ebuild 4763 BLAKE2B d6b6a5f62f624986286d504aed9e47b1c0380ca4d8d1de874be36d03aef542b45fd889a2cd97d264cf0defa22e9cbee676d9b4b6f6e2192c6a8dbc76287a9d86 SHA512 8e006a9da05e7556d505af790072fd96aff2f76d88866d9ad3dec66c13a1edf8e95f6522daef65bd4f15a16997c551892ac17e550a1faf2d176e721be7e2ed3a
-EBUILD notmuch-0.28.4.ebuild 5091 BLAKE2B 02690eff6875af771697d9b63b94f7d02f29bf3744599ae632c5b0cd451967b3a4385aabe0c15b5a2ba861d524e54b45cdaab62ce8f40f17ec30425ac729a6a8 SHA512 54542d5c70abd2193b869371b804a2a8a9e3340bf3f30e91d54738db7eada42ad1dfd81c7b109f52c22efe3600e9cb30a233f53bebc3d5b345542307f49ea9db
+EBUILD notmuch-0.28.4.ebuild 5090 BLAKE2B 8987d5ca0226b9a8093a3e1d0c48cbd24272a4f5aa1e41833ea9cd10cb02fed6199181116700cb0cb025301460397d5cca6300e7c33ddb84aac54c8476c332bd SHA512 971f6d3a84f360f8e4bfe161017fb79c58918610752344dff99bc9872fb303b14e172e2224e52c32130742b1e74e97ec879b5e1b0cef2a7e386b2f7eef4156b5
 EBUILD notmuch-0.29.1.ebuild 5038 BLAKE2B 75f4181ae4670d6019d4715255b451c28a3cec3e0a2dc27a7bdfd3b3e7ad88bdf25eda710deae7e90f583a1998e9769f30559574d2887bf1b32cc46008e315fd SHA512 f3beed9c567af5a0af98af8c46f497adf1f6400d42fe75abc968cdbe65f38869e9b07fb65fa1a00c7d42f38be18b124f60775d15933ecf8cc8a9ff993cd57b7d
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.23.7.ebuild b/net-mail/notmuch/notmuch-0.23.7.ebuild
deleted file mode 100644
index a6bf7055ece7..000000000000
--- a/net-mail/notmuch/notmuch-0.23.7.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha amd64 x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
-		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser )
-	"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
-		popd || die
-	fi
-
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	V=1 default
-	bindings python distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../html/python || die
-			popd || die
-		}
-		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
-		elog ""
-		elog "  source /etc/mutt/notmuch-mutt.rc"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.24.2.ebuild b/net-mail/notmuch/notmuch-0.24.2.ebuild
deleted file mode 100644
index 2c35142be76f..000000000000
--- a/net-mail/notmuch/notmuch-0.24.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha amd64 x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
-		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser )
-	"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
-		popd || die
-	fi
-
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	V=1 default
-	bindings python distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../html/python || die
-			popd || die
-		}
-		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
-		elog ""
-		elog "  source /etc/mutt/notmuch-mutt.rc"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index 94ee48c3ce05..fa6fbf55ee13 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-mail/qmail-qsanity/Manifest b/net-mail/qmail-qsanity/Manifest
index 919cd8ef8ea3..e50f210d9bc7 100644
--- a/net-mail/qmail-qsanity/Manifest
+++ b/net-mail/qmail-qsanity/Manifest
@@ -1,3 +1,3 @@
 DIST qmail-qsanity-0.52 3888 BLAKE2B 41ef561890d16bc3ef828a05bb0273bd7a6183dc2d72c3b88ece1ed218a8dc3962791d4d7d8c2c16d97a5f01820ccba93ce0e999fc01a8d3434c9f33c42f3825 SHA512 fa0b9f9efc3138ab700d03fab4214b1f1e07eb03a812f0c74435c545ddb64d0a2e9b47bb3c063c16259c6f2e23ed2157d6316d6cabc820ad7f00dbf22ae4c0bb
-EBUILD qmail-qsanity-0.52.ebuild 565 BLAKE2B e906a450997caf8f8d9b1b94738c572cc652f27517f2fb3dee9ad215c8e301aa1d86bf4fcadeaf60eeb79ca909b5f9eaed5e3c04fc5dba63779816659a822d12 SHA512 165e9d054428ab23e5cc7fd4773eafa4e96d289038a256d6e53da6fd9acfcc33d63cb114ccaf7326ffd7fd612396d2dd33d5db6239e53f4a207a1f3cb4798893
+EBUILD qmail-qsanity-0.52.ebuild 562 BLAKE2B 1f262e275233c3a9dd325bd7db035ee122f81ae4905429301ba529f24d172da545bcf77e9def6af0bca8ec898c4c81a1b91008932fa71f2d5618b5fc28753b75 SHA512 771a6c8fb9559c3bdecc6fcff4401c188f24240e7d6c41a78cae4378e4090e4dcc4c3e4fa31cbbfd0f9284d3e9b5d03bc06ec301fe15e72496da2af99f81f78d
 MISC metadata.xml 509 BLAKE2B 1215bc847899983e679cc5090d8fc61089f30aa361dceb0b8c437ef734e3682277e3e58351e09eea32027f19264a7ae1ea2c976b849e56c875f8365787d05a61 SHA512 37810a279e6a0c895736c07fc6005f4937da4d9af40976aeff1fd51668a067556f67d3afb86caae3a567c152d1d1db9f5b171389e8892785805e581b7cb5b708
diff --git a/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
index baf9c2f5405d..fca9a037994b 100644
--- a/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
+++ b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -10,7 +10,7 @@ SRC_URI="mirror://qmail/${P}"
 LICENSE="qmail-nelson"
 SLOT="0"
 # Should run on all platforms without issue
-KEYWORDS="x86 ~ppc ~hppa"
+KEYWORDS="~hppa ~ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-mail/qmailanalog/Manifest b/net-mail/qmailanalog/Manifest
index ac55c1b799de..f1761f1e9a3d 100644
--- a/net-mail/qmailanalog/Manifest
+++ b/net-mail/qmailanalog/Manifest
@@ -1,5 +1,5 @@
 AUX 0.70-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b001353b1f5cdc8b5f73d507a8edab3f525b4c1407c02c0c0d11e09e96eaa5d041217da23f92aaef6c03e1 SHA512 1d4c1abde8eb0b4d6dd2254be29b685c922265ededa02a19010bc487e2e2013ef2df9a86a5dd797e0d7a30567cc18ae72324f2a67558633aae76262b2a9681a1
 AUX tai64nfrac.c 1461 BLAKE2B bf9c933a5916c578dfbf9fa3c9a02de188b40e376f545a9706fecaee14fc4270af90f1d1fa7f6b7035b23fb4cf0abf8cb701f17469c7bd95bd232a81ea1d5d93 SHA512 0febee72c3a0328f651134105e6c9c7db1f2822458fa873694cad9807847a9a1bfb7d91a3f7a7ecbb99564515d001e10f2829f70b9a8e768d26764c0ab408be4
 DIST qmailanalog-0.70.tar.gz 28416 BLAKE2B 771a9d9cad36f770c1b9032808a5252e8cada6ebed311272e5d2cf7a34449ec9e59c9c032a1c165103535a6eeca03331f56d8a484c171308c9fee49f8b4b2f12 SHA512 0a4991a9ac13b64494b15a6ad42df1bee273a7a3c5ead923450d5516d747989e80e3a0f88e29203dce24dc833cc3bb46d5935633f67bed547f27ac22ad866f3d
-EBUILD qmailanalog-0.70-r1.ebuild 1277 BLAKE2B 7681446e474887922686cbc88607a34b27eb7fd370a62913d8ade784c6fd4af2b12f07cb85d3437a87d29403d72216926be7d0bc621f9f0119f01da4eabd1ac1 SHA512 f071a4884d301008ebf04d9ed78593007e3198cee4b7045a962bd5d5646395467f62b23a06ab19aca9dc55557b4be1d2287b21192aae7ec9385180510a46acfe
+EBUILD qmailanalog-0.70-r1.ebuild 1274 BLAKE2B 7841b141664a87dfe241afff877d9784d40b475e989120ce7d55a45df927f613d2183e933b3a684a793baf0a42db035ea798f6861884631f4775b54dc479f97c SHA512 d62555a3962ddde1f27a12f86e809f04ab2631094d31966eddeaff187b61ba8bcbe7430f8befbf1044a6bf34f4c412972144f87bc9b52089d36badbcd986789b
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
index 2c0e98e8b6d2..efdab855bc16 100644
--- a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
+++ b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -11,7 +11,7 @@ HOMEPAGE="http://cr.yp.to/qmailanalog.html"
 
 LICENSE="freedist public-domain" # public-domain for files/tai64nfrac.c
 SLOT="0"
-KEYWORDS="x86 sparc ~amd64"
+KEYWORDS="~amd64 sparc x86"
 IUSE=""
 
 DEPEND="sys-apps/groff"
diff --git a/net-mail/signify/Manifest b/net-mail/signify/Manifest
index ab974827dbf6..77921a620287 100644
--- a/net-mail/signify/Manifest
+++ b/net-mail/signify/Manifest
@@ -1,3 +1,3 @@
 DIST signify_1.14-1.tar.gz 13853 BLAKE2B 3bdf1cebfe4f4e88c5db94d2faad42c99f47a2bbc71374b65f5c576f25a26ed999e58cc0e1f8f084adab8e4ccc4bb6ea4cfe79c0c4b9b990d8abdc681f4118c0 SHA512 4b94c6bae6d36b60610318625eca7856f63a578ed22cc1690ea5ffa1d823471c73729f3f404d5d944f3262004ca6a9dd8ece1ae2cfa1dc3fed0152614792f7e2
-EBUILD signify-1.14.ebuild 698 BLAKE2B c092431907d851ebcac8a5907decf0bff83c9daba97e3caebf94815b66c1e1261a38578c919081cc63396f41b9c575274ddb587a521ed0b1e61de8bbd3b30c91 SHA512 d7490296a08e6c3d221e08d2dbf6f4e569b49e9f6b6851a0142879b3959a0621eab482c282066ba5030b9254cfa2542219dd848a140741bdba8e0f7334465a53
+EBUILD signify-1.14.ebuild 695 BLAKE2B 9ff73c8ca6b4ec16fcc17a04ab250c1995f4eaa540b83da895ecaaa4f6ce5cc0e1060f7e66b6e54e7ff7853077be157145a47e8c0001a21bbb7c1ec5f7a860d8 SHA512 7811d825d1d1c03e8fb6a5f1e70c765c30fffbd82aa768f1e89e4e15b2b312ed9a066d8f03e8767f0e02f669691c5651fed4391f4509b58542044f66b388b42e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/signify/signify-1.14.ebuild b/net-mail/signify/signify-1.14.ebuild
index b280797ec9a0..238ccb6c2656 100644
--- a/net-mail/signify/signify-1.14.ebuild
+++ b/net-mail/signify/signify-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}-1.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="ppc sparc x86 ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"