gentoo resync : 19.03.2019

19 files changed, 870 insertions, 13 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 1da74dc569dd..d5c635a2756f 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 009c3d50fce0..91ac37cb83e6 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 6862 BLAKE2B 3c90f93ea7dc0f096dfcee77c8c9ca8a776b044e184e7c85082d5b23162aa0bfcb0b5356154bdc6e87d12eea35d5df14b0b73db34a441c3cb2d1b936e36f0a65 SHA512 54130db2d991717f584272291ed385991a9434c6337daaaa52ca896f811c319a77c8b7faae9482eff71978bc87aad610b49b98138b354ad7f2b3b369156e3361
+EBUILD courier-imap-4.18.2.ebuild 6858 BLAKE2B 01d3addab86342975e435dae0659314ca266ad4dbf700b97341c9d03af2b7a296b773a3799a6f725e9309ffe8ff09a64bdb5682a886119ab010848c11b4252f1 SHA512 ebc26c113bf70a0d69ed8f2d539d7e4946cac69bf8f58590fd2e5f12f1b8d3e0b0f73096e41548e9eeff7489e3102293423cf66567f4826b6b964b481d09a23e
 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 67527a22a9c0..8bb39825b429 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/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index ec4c5a632df2..6ff87795b114 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,5 +1,6 @@
 AUX cyrus-imapd-db.patch 2193 BLAKE2B 6b8b2601e4eb7fd124d8cfb1f6409a8f42a3b8b35781034d5258bc820e27da8b0a963cf7904b0d731ca614f1104550b9437d48005c26a174e2347da7e632bd3e SHA512 a756552c0f1dd548661b4402e170474977484f3a4b32e765f8648d02109dc131d313e924b07bb3ad704f34cab4aef079b206b6d1e8d97911657886bd2476910c
 AUX cyrus-imapd-fix-tests.patch 471 BLAKE2B b527a435ef74b42dc1e68ac0089dd2050a2cdfbdf11264fc7097b39c16db9a690000f397bf29cdd3e8003d3e15546e9f67c9c9aeb505d50976a3568404bafddd SHA512 ab967c8f493d902510f25268d3d63c3c60246cfd2661ae3a19e5a89cd238028ac3eac4369736b51fc2a0c27407958963ffb1e6f8ba19b5d19b53a680d3737fa0
+AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6
 AUX cyrus-imapd-libcap-libs.patch 2251 BLAKE2B 2caa105c2f5608468e89f0c533cd0942ef286f93f941ab5163e53ab9302f3e68c7ba72969f4fcd13efa41e1d99a239f946f2970d0b34583e3a33331bfe3d4adb SHA512 c8f6676549f1e4e91be40da22a3061ae9b660d159c0d64e4848f0550214c190e7d1357dce20ba181ea2d8425e21552ce44faa04213b862740da62bf3f2f09b14
 AUX cyrus-imapd-sieve-libs-v4.patch 5751 BLAKE2B 016a21356199580e431f86b6a594576679dc8b586668fcf333d65ae570dd129fb8fb4174d26965e09d398729c7a8205bc89167442e4d43228942298bb402b844 SHA512 cd9f5c23f79720d768b3b8a089b3f5c078825465b3b0f28b7b629bc07415598f9195218e35bb7bebaca3499bdfdd30a137ea6a3a455a84386e9d02de41abba51
 AUX cyrus-imapd-sieve-libs.patch 2207 BLAKE2B f9d508fdc11d4309687e921d193f0c5b3ea0f6ae78d98623974d0decabcc685c5f05b105597896d59df5f44273090644086b3f936191d398048390ba201d848e SHA512 1d198945b8522f587a84f6241dffe7e3390b4904b187d4d7b121a509f6d5d47270c2609eb6f3ffc0aa5a792cb576fd8e5572884439337f05485ada3533f81484
@@ -15,10 +16,12 @@ DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b37
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
 DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a SHA512 f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960
+DIST cyrus-imapd-3.0.9.tar.gz 10771916 BLAKE2B cc483246c83ed55fa7d4e85aa8189852f2e6be23aff5bb478c2d2123e3d928cc8248e580c80c1474b2b3eea9aa1c0f8b3336f779e72e690d8d093e70993cd657 SHA512 d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738
 EBUILD cyrus-imapd-2.5.10.ebuild 4676 BLAKE2B 4e3960ade8b08e85a9beec894dd11bd144b218ca665fb4ddd762db8e881dbaa8a1f814fdf8e811e7d54e5d4f6456d601898f2fd1b7065be6edfa6c38dd83b965 SHA512 80bd9c18c80d5408862f4ad20b4f0f82c21b3a11f5ef54e504cdea454e0a7fde5f0cd8ffbf455665b0a907eadc243c45d5ccae9a08dde5faca7ff2f9cddb1ceb
 EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 BLAKE2B 72c2a8d1927728dfb638eac22ed3ecff4651dcee12250e169683dc910c8132320ec23b09408eace65799be99629c529a37298f5cb51d91817fa7c44899d02fac SHA512 c14ac12b41bb9594b7686ff6f1fe44e9af160f8eed4cfa7e1c94d1c5098fb55ec160b7b6bfe30bfca494278d18bfd3c9c37a8ed3991e02889512d43f9dd4ceb1
 EBUILD cyrus-imapd-3.0.4.ebuild 5896 BLAKE2B 933086d8d6d45ec33a5a82a0a4a90b1c83848a9d59e39d2027da4ea52a28e9302040e39f61a28ef6112d012cd7bd4b9934506993cb2b8d6a1de75a15a59828d0 SHA512 e0ebe34958c93003798a045c64287dda83d97d1d829889f4601446567ac2f0334a03acd554f0cacdd86b90fbf167f13c020e5b3edbdf78f3d9f9a9d871ea140f
 EBUILD cyrus-imapd-3.0.5.ebuild 5944 BLAKE2B 43fa76c0bda73b8e67440692b3f5586c6bd4435a852c90c63b986db724eca95c12056182e6f52bbdab827aea004e75257a6bf7ff5b0d1ae66d54a865c5b22d5b SHA512 2e9f38bb940bf33982b5879e39106e195dadc47c75772951cfc077873c40d38bcbf479c42ab915b620c1d442d454fc8314f10a98400464f11d2798ced74fa536
 EBUILD cyrus-imapd-3.0.6.ebuild 5946 BLAKE2B 39e6abd36bcc447a79b6b6e34f051090237ee96996f00980e3f1ebf70fa66b1791ac2ad3ed42f1038ffcbf32a650b3d9e29b3d19e5aede7c960ce11d23377a7f SHA512 66fd355b5c1f3f1b99f96829de8f5d670edaaa0cc4129a8a08d8b30509b86104456fcb912f1a444bba2132d0724530b7978d1d9dab220a5cdfc906506583c8e1
 EBUILD cyrus-imapd-3.0.8-r1.ebuild 5818 BLAKE2B 552068a64832e0576e3ec639b588ed572b97c5ba0f33c12bd06af54afde4dd274d96642d014ffeeff2e36ad71753c1968031ca6bda696cb33f05ae5baab30614 SHA512 6db81146d2a2930f7b73e975130e61ba9da1c9e511ab8ff838c79a834732191dcb61376bea6e4db557d6921daad8e58f1af106c4be3730c5c8d91d86c3386f75
+EBUILD cyrus-imapd-3.0.9.ebuild 5951 BLAKE2B 555fd5360af28bf6163302399727986d47e829148cc5e8f9ef88a7b703be4378928d82d4ecf4143c8d0cd80dd20546fc2e52f9020b72312e6c71e28363bc6342 SHA512 74d3e09860e5dd723e6f8952d3de8048318f248e701eb314962240b1940c39019968bb432513fb5c136b876264e04ab2618674f449cb895eddc89948912406e1
 MISC metadata.xml 871 BLAKE2B 4fe48aebf6e59d75cf53cafc92d5bf4668c4a489dba3a43d6df6c4efaeb74590c49f083e03ee9d5eed32ee09b324d8116bcb0fc77576f8aa77a96c56a739dfae SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
new file mode 100644
index 000000000000..c6ba07699dff
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+# virtual/mysql-5.5 added for the --variable= option below
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	sphinx? ( mysql )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch
new file mode 100644
index 000000000000..4b1a51056f53
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap-libs-r1.patch
@@ -0,0 +1,35 @@
+--- a/configure.ac	2017-07-15 07:26:38.375295969 +0200
++++ b/configure.ac	2017-07-15 07:28:33.250194410 +0200
+@@ -1351,7 +1351,9 @@
+                 AC_CHECK_HEADERS([sys/capability.h sys/prctl.h], , have_libcap=no)
+                 if test "$have_libcap" = "yes"; then
+                         AC_DEFINE(HAVE_LIBCAP, [], [Do we have libcap system capabilities handling (Linux systems only)?])
+-                        LIBS="$LIBS -lcap"
++                        LIBCAP="-lcap"
++                        AC_SUBST(LIBCAP)
++                        LIBS="$LIBS $LIBCAP"
+                 fi
+         fi
+         ;;
+--- a/perl/imap/Makefile.PL.in	2019-02-25 15:43:44.370676803 +0100
++++ b/perl/imap/Makefile.PL.in	2019-02-25 15:44:02.595285944 +0100
+@@ -90,7 +90,7 @@
+     'clean'	=> {'FILES' => 'libcyrperl.a cyradm'},
+     'OBJECT'    => 'IMAP.o',
+     'MYEXTLIB'  => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"],
++    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @LIBCAP@"],
+     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", 
+     'EXE_FILES' => [cyradm],
+--- a/perl/sieve/managesieve/Makefile.PL.in	2019-02-25 15:42:40.852554632 +0100
++++ b/perl/sieve/managesieve/Makefile.PL.in	2019-02-25 15:43:05.029362231 +0100
+@@ -69,7 +69,7 @@
+     'ABSTRACT'  => 'Cyrus Sieve management interface',
+     'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
+     'MYEXTLIB'  => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"],
++    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@ @LIBCAP@"],
+     'CCFLAGS'	=> '@GCOV_CFLAGS@',
+     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 3a72689d184a..1572dc7fbf5a 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -14,10 +14,12 @@ DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536f
 DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
 DIST dovecot-2.3-pigeonhole-0.5.3.tar.gz 1827329 BLAKE2B 0d484906022217b1082233e6a3a20c17bafc68b90ce1c5c956c714d111ffb9ab49a3794e199695bb61a1f3ad6bd46e56e63ee3c140cb01eaa7589ef7bd754b19 SHA512 8403b1976a915836ba875b96825446d46e0d8c7ff245ed1f2b014347fdc78a81f9ed6dbd05bd3b4f1f7072edc5e9a302201cdb375de44436adcbb83919f203f5
 DIST dovecot-2.3-pigeonhole-0.5.4.tar.gz 1831570 BLAKE2B d3e7dea3cdcc2b44476401046f6bd6a110a026d523ada2a898b5c99f509cfe37771dcfd31990139f5f4c1c6b405a9f27359cfd27a6e95525515a3aabb71538f8 SHA512 9c82cce7540f8ab66e2e370e0220c99048d6ac53ed680cd763e0b03d0200e2451cee4303ef97b87a16e7248e1c73b92ba91b47a2a20c75cb2cd62695a28046f3
+DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc SHA512 21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94
 DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
 DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb09296af617530a4d5a89b4fc12055d006d1b283a4de076f27d59deb64324b96f28620958ad85c38197710c5decdf7 SHA512 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff
 DIST dovecot-2.3.4.1.tar.gz 6925073 BLAKE2B d8143bad01c107b68525d0cfc110e5bf4e3ffa0af49e7cafdfef263374e146a7ef6ed7107a7c5216c4b52da3640d7a9a80931c01d125d3852fa265171e4d4e09 SHA512 ff21aa0f0cae17dfa66617291688856727412defa48bad2b6be057cb509fbec1c2e134afbfee69929d06b8692a0fcbd8451671ba02860e1673ae1c9483c2c17e
 DIST dovecot-2.3.4.tar.gz 6924178 BLAKE2B 13e52a1b04036d58e68d762c9330dd5efedbf2421d658a8b657ca59e311b899a9b4a84fd754678ee67cd5b60f47b5a5ccd6a3fa08fafca7413c8b1e6ecd2fb51 SHA512 9e97eb08c319c417e8abcb430b3e6c87ed5aa820d6288656fdfd958ff34664f67202a66e4846763bfc85b309b116cea8012e49dab98b478c57974cc178a37a5a
+DIST dovecot-2.3.5.tar.gz 6970480 BLAKE2B 006f64ce87e3eff04f3df7689ba9caed0b6b4f83eef28ee8fc2bafcf4a90b0255bf3d0d5d6b32571de8eb339f720a4d7b6de7dd5e3bcf6d03ecc5d6fa679799c SHA512 10513c371aeadd52184daaf8dbb9a7559c6db55e34182bbb2c9539dae0897ddcc76f6fe2ce6a81c7ce0cb94c7f79438ae3bb0e7db8ed46615feb337b4078ecc6
 EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
 EBUILD dovecot-2.2.34.ebuild 8652 BLAKE2B 473b843fa61c17b3ce4474175aca83e9b5c76641853475de27a87b4a84f8101a5dea4c22a6aac0eb21b253ba9dcc8e139eec3283629f2f672d350144f71d3fdd SHA512 0eed64f5d2841aa46c727ed75ba5ff7ac4da8b3bee056990d327e36a8e951e85b70822271dc30dbb3ba80b599dd5442c4ad5efe7cd00440795437ba7218b47dc
 EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740
@@ -26,4 +28,5 @@ EBUILD dovecot-2.3.3-r1.ebuild 8836 BLAKE2B 214e3df6d39beb54d30fb794b97368bea755
 EBUILD dovecot-2.3.3.ebuild 8789 BLAKE2B 6ab8548635742ba2dc82fe4b06ee4438840ebcd1e2d4cbef4662e3fb42a74a10aed252e6e28ac6f56b60006f44c1fcd823373f86d4b06245e06a8ae3cb7b6cbd SHA512 466b7ef0098884c9ef885048337ac68aa9aa3f40ad9a2c5fa6231f3dfbc5909fa97128c2872c8e9fde6a9a2129a096cabb1e681e2dd5fa0ac3d9cf89912d2445
 EBUILD dovecot-2.3.4.1.ebuild 8799 BLAKE2B d5b1129e0f7c6563682e345a5d7575761b5a206caa2aca36c4e002b51e4357980a2f93ecbe3974b220b00b04dab49f141580d77825c2850fd2cc4ffe089c1fee SHA512 a164ab663313a9b8334112377349a2ae807140a27d5c618d5d69c30a926d2d2854696516a4f1d59f9d4b8154ccd116213ccf0f9aeb7e1ddc1ba6717e0c744978
 EBUILD dovecot-2.3.4.ebuild 8799 BLAKE2B c80a46f994df324b88f35b9e6514742d12b93aa49016c9b655d3ee90ac5d27d14d3e26da9dce440dd19b59f3dde9d115f9cc6fe90dc48f7800ecc9bfa3ae0987 SHA512 2d4f00a1ab7dcd716141df08002251f26571d153ef58036de0dba6f828f96b48c9402b91fd4dcb2f5310332ad9bd7b8596b334df348ab7365a75a957e82c8c57
+EBUILD dovecot-2.3.5.ebuild 8814 BLAKE2B 20510b5b6c93dcf98b396bba828d646e2957be0da1dd626fc8483fbfd5709ff5ce284bae6e2303c8441eb585a96f9656d0511fa288ce759dc959bd3ef8c90f0b SHA512 538968024f28527c502d6f4da58a46c938d65294f0191ff9af7237604db852f031fa1f6dd6cd81cd7e20d4eee401d536262618939d55ab6a887eaa0de4f2ba62
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.3.5.ebuild b/net-mail/dovecot/dovecot-2.3.5.ebuild
new file mode 100644
index 000000000000..0cac1f64056e
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.5.ebuild
@@ -0,0 +1,294 @@
+# 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 ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.5.5"
+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 )
+	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"
+)
+
+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
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+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/notmuch/Manifest b/net-mail/notmuch/Manifest
index 7250aa3ceeaf..601ddb2e61a6 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,5 @@
+AUX 0001-Use-loopback-IP-address-rather-than-name.patch 2100 BLAKE2B c949840e8f25a7730b895aa4bd71003ddbc239dfaeb28ec20158b48bb8de29babb5d6e3badeeee601a1037f080349a57d0a4da5ac9dfe226234fdfc223e60bff SHA512 35ee1baee61d773f9c21ef8fc8f3703347a9cb7a4bbc9cd3fe733dd91cf5c0b06716f25ced78d3d34d9725f0cbd8916a71e415b5d2cbdd58936546a9d09288ce
+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
@@ -6,10 +8,12 @@ DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8ea
 DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd
 DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7
 DIST notmuch-0.27.tar.gz 912583 BLAKE2B 75bb13e9666bd2898f58e5ecdd6a180d0da21188665f107857e6729f057525bb7c94832d140de8ff7b3fd31b51e33bcbe5b59d3fc09ba9a854c1c05499df762e SHA512 7c58c6fe5c3b43a979c3a439a24106417120726fd688b456d9084388ddd7c88ab1b6d99cd4676101f085d60bb37099631caa286b76588fcb041bb004ff325515
+DIST notmuch-0.28.3.tar.gz 921920 BLAKE2B 9b96a0cac8188bcaf9efab532721449c655fec4dac77c3eb327e576184cb430aa0fffc9ac74af82ad3ad80097afdda5c8accddbee7e5720d180c071d9dd2ef85 SHA512 dd3931b78cc27540e962f1fca5f4ebb1c04b2637a5761cda023f307fd9be4b5ddc2af26010330868c55200fa96b60b2a11b3b22d4c20d2a4a2d3787421ed85cf
 EBUILD notmuch-0.23.7.ebuild 4582 BLAKE2B 5e3d91233776f8bea407db340ad5ad083628f0d4d06849934e8dc78385acdb64bf2f9e1d804399636170f1524efc1b3d778a0ed5e4f2e32e01588b111947949f SHA512 abb5e69be4ee2405ec9e59683b040d7e6c2492403f3bff5d103cf2e957e9293a9f91b21a839d847e13f690b531c39b9e8df5eb6bf044e76ef26707800a47765e
 EBUILD notmuch-0.24.2.ebuild 4770 BLAKE2B 40bb192f400a0114976120b1b15294ce015d36637001e25a354aec5c686316e2045136091c71727ff003264be198780e132f7cce087310e5225a3a584d919a49 SHA512 d2a176d88df335783fcad6a397a44d6726c723f1d70fafafe986dadf138ba1410199a2b1347baf69d6589357c18931c1c9b791eb9437558ffb16afae9de3d654
 EBUILD notmuch-0.25.3.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62a1b6d5e8392458982e5d829dada98492cf778d46fe43d0df0618f7748d705d99f1c406683299c16f407b40c0d9 SHA512 76825642fd0d738345f2d9f2043d527c4d60d36b12cb5e44530af3190a9e7c760f1bd840744f8bec59b145a634d5207e7636413671b3914336acd881e0734623
 EBUILD notmuch-0.26.1.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
 EBUILD notmuch-0.26.2.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
 EBUILD notmuch-0.27.ebuild 4950 BLAKE2B b7b849221f3938f311063a3c09906e2294a9e6551669666277aa8eddc1aa3573d5559c94ab068d30f63ddbb7fdc3f0ee1e427c8718e6f4dfa53ea03ef6b64d36 SHA512 01dc2372a92c7c7d7fe1bf08265a81dda1794fab5a7657beab11816b0bed8a27277ea2de1e8123f132fe0afba980e60bb6639c61370e402dfdf3c9eda2d0a337
+EBUILD notmuch-0.28.3.ebuild 4958 BLAKE2B b72ec056bf5ba0cd29168617dedb70c5644b165bbd4223d45bd93470119f160d3da3a98e21ef53bd13b326ea60e5e0f8824dce23e529f3664bbd33d5baccb6cb SHA512 c4972a8e6eb1b2cbb4c932cb14a24324ccb69742c9414f89b8258872b02d5364f21a53554ab4c06745e2e713673553807e9bb21600fa14185f2e0c34b87d29f8
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch
new file mode 100644
index 000000000000..f7e1d7e05e35
--- /dev/null
+++ b/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch
@@ -0,0 +1,62 @@
+From 9c15b508819d15d0852d71c2e897550cfaac09ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
+ <aidecoe@aidecoe.name>
+Date: Thu, 7 Mar 2019 22:47:55 +0000
+Subject: [PATCH] Use loopback IP address rather than name
+
+With FEATURES="network-sandbox" 'localhost' name lookup fails.
+---
+ test/smtp-dummy.c | 8 ++++----
+ test/test-lib.sh  | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
+index 71992edd..e72ba2d0 100644
+--- a/test/smtp-dummy.c
++++ b/test/smtp-dummy.c
+@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
+ 	fprintf (peer, "502 not implemented\r\n");
+ 	fflush (peer);
+     } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
+-	fprintf (peer, "250 localhost\r\n");
++	fprintf (peer, "250 127.0.0.1\r\n");
+ 	fflush (peer);
+     } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
+ 	       STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
+@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
+     size_t line_size;
+     ssize_t line_len;
+ 
+-    fprintf (peer, "220 localhost smtp-dummy\r\n");
++    fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
+     fflush (peer);
+ 
+     while ((line_len = getline (&line, &line_size, peer)) != -1) {
+@@ -182,9 +182,9 @@ main (int argc, char *argv[])
+ 	goto DONE;
+     }
+ 
+-    hostinfo = gethostbyname ("localhost");
++    hostinfo = gethostbyname ("127.0.0.1");
+     if (hostinfo == NULL) {
+-	fprintf (stderr, "Unknown host: localhost\n");
++	fprintf (stderr, "Unknown host: 127.0.0.1\n");
+ 	ret = 1;
+ 	goto DONE;
+     }
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index fca5277d..fa8fd5bd 100644
+--- a/test/test-lib.sh
++++ b/test/test-lib.sh
+@@ -320,7 +320,7 @@ emacs_deliver_message ()
+     test_emacs \
+ 	"(let ((message-send-mail-function 'message-smtpmail-send-it)
+                (mail-host-address \"example.com\")
+-	       (smtpmail-smtp-server \"localhost\")
++	       (smtpmail-smtp-server \"127.0.0.1\")
+ 	       (smtpmail-smtp-service \"25025\"))
+ 	   (notmuch-mua-mail)
+ 	   (message-goto-to)
+-- 
+2.19.2
+
diff --git a/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch b/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch
new file mode 100644
index 000000000000..85ca4b6d4a52
--- /dev/null
+++ b/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch
@@ -0,0 +1,26 @@
+From b5e15feee139096720272d2b435ce7c4114fda15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
+ <aidecoe@aidecoe.name>
+Date: Sat, 9 Mar 2019 22:42:21 +0000
+Subject: [PATCH 2/2] Fix "jobserver unavailable" warning
+
+---
+ doc/Makefile.local | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index bab3d0d2..dfe62295 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -56,7 +56,7 @@ sphinx-texinfo:
+ 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
+ 
+ sphinx-info: sphinx-texinfo
+-	make -C $(DOCBUILDDIR)/texinfo info
++	$(MAKE) -C $(DOCBUILDDIR)/texinfo info
+ 
+ # Use the man page converter that is available. We should never depend
+ # on MAN_ROFF_FILES if a converter is not available.
+-- 
+2.19.2
+
diff --git a/net-mail/notmuch/notmuch-0.28.3.ebuild b/net-mail/notmuch/notmuch-0.28.3.ebuild
new file mode 100644
index 000000000000..445fa176ab44
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.28.3.ebuild
@@ -0,0 +1,212 @@
+# 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_4,3_5,3_6,3_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/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+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-3.0.3:3.0
+	>=dev-libs/xapian-1.4.8:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( dev-libs/gmime:3.0[crypt] )
+	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"
+PATCHES=(
+	"${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch
+	"${FILESDIR}"/0002-Fix-jobserver-unavailable-warning.patch
+)
+
+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
+
+	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+}
+
+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
+
+	doman doc/_build/man/man?/*.?
+
+	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/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index 4151337d8c74..fc1bbbd21d63 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,5 +1,5 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 EBUILD qmail-autoresponder-0.97-r1.ebuild 1370 BLAKE2B a59d4953ac00090079e466f6539cf948ba9312f801102a020633c14d93ea0ea59bf1642aa529e03ec6563c678a85dbe1839b3e6920f818115a0e7c64deadab70 SHA512 5c21559ea633760e0e400fc58f766446e3d597d12a390439decbf672f1a1145f56e3fa781832b002e96c8f44a6abd12b27615b2ca83a6927206514d6b3a122df
-EBUILD qmail-autoresponder-0.97-r3.ebuild 1411 BLAKE2B 0cd9b1fcbc079f0933877450d65380cfb826d2ecdde855d878f827c75845473c92371c9d429bd089027550bb51443f25a267cd553bcad97a935ea416445703ae SHA512 4b6be849df526b67c5d4519f2e091b64a23291d324530d42fdd7d27c4c1043db6a39c61182bbe14640f2180fd9895898929fd1da196b4a32e9433a36f86dd000
+EBUILD qmail-autoresponder-0.97-r3.ebuild 1408 BLAKE2B fa6726942c874c8e07bb14eaa70c33a4406fabf987718a05680c91fd814b24fa68b704bd77806c96889d61fee94c52bcaf67fc9a3c19366e5053dc246a64a94d SHA512 ce9bc6b50812124da8b81924dd527b533b407fff6b64b91629132c4295557c5b8a54053fb12f699bc359998479bae985f7ffc77815ab78fb3f9c1149b65a60f0
 MISC metadata.xml 489 BLAKE2B 749ac463ff82741ea3bfa354b3c3ed29a6495c276d08f22706b5d614b4e298a2c7670b1b3b2f84a92fda2837756c1da32b7e0177e96832142d324d78a59ab4a2 SHA512 de41d320e5c5efa4aaae8cc862990179bca55069f3ec37a4633af610729d37f39a4bdcfdb6797c940f1920b2475e575fe55e12230a1ad993e65464fc37a5faeb
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
index d27b7bd9ce53..6f70922eedd7 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="mysql"
 
 DEPEND=">=dev-libs/bglibs-1.106
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index 2fda9ed304cc..bb5f80f0a858 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -6,6 +6,6 @@ AUX uw-ipop2.xinetd 448 BLAKE2B 5147929370d0756b402a058ab1cb72c381c92d72af65ea5b
 AUX uw-ipop3.xinetd 357 BLAKE2B d5b89454f1a823e00f59cb2cfba33362b0b519a1cddd4adec483331a39329d36e1b5806f8447ac23b38313e109fa06cdd642dd703486662e7262bf081f0eaa79 SHA512 ccaaf4b6972ebcce8ece756562e51b1a0c752c50378930abb807ba878842d1afa8d88fecc091ee0f228149abdd3426fafa06bc882c3d684e44dabc4d0d32e347
 AUX uw-ipop3s.xinetd 357 BLAKE2B 78c781c560fb3f244b9c9d96dd58a5df2c10f05ffd22470f49c4e96e93c32e452238a6213a3239ab13a993e26e6ded1e70d1b2a9beb3d291dd487f5a4d91818c SHA512 f60eed919c76d1a4d6f4d4f75c9801003660602b13bbf6c850ddc33c0a1a2ff087454844bdfb1caa4bb8e5239cab8cfacf84bbda485c793f14199a510d71013a
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD uw-imap-2007f-r1.ebuild 4671 BLAKE2B 8034f1db1c505833f7606efe621f79d2a7d95fe9e9440183d02252a3155142e66c80dbed469226d3a47539a6cb23cba9c591b57bfc767640adc582e620bf9dcf SHA512 5a2b876a9ca61d7b05a85a7be06065aea9964bd9446f1a8d71d9ccde819a96787a2f8a57fd2cbaaa86e9981a2bd73d774879d57364b3c53acd8f18eaecaa4c52
-EBUILD uw-imap-2007f.ebuild 4407 BLAKE2B ca0a8e858fc717b43958f64dfc1f178fe7b4b6188d30953236c6f577089e4d82d2f450c6950d787c9b6338c8d3abd49234a0b0616edb8c6891d4e5c2c6a8a6eb SHA512 04fdd4d0f9f0bfae8b05c49107eb53b06fc3471ffe27ca0f143ae5780a839e20338878c45159b61a985de3c1987ae5db40f69530d4190993a6ef2d08f8908c63
+EBUILD uw-imap-2007f-r1.ebuild 4673 BLAKE2B e496d63c51f88d7f80a43df4e98fe3cab27b35e2786273c90ec699bbef5ee5bee63bb669c42b53372c592343812f9df1788bde0be652d7d4e5afb11bcc3d52c2 SHA512 1b94e2f04e3a9cb0f1c3b83f85abe7adedc65c542d86faca265acb2f0d5845a41809430b4ba313735ba05a20e08737a22cc81f3e97abcab6584d658fce9487b0
+EBUILD uw-imap-2007f.ebuild 4409 BLAKE2B ef3ac9764c0036547a7a839cbdb1b8a64b198ef8da3eb2cc844250125ce58e97db189ec7920ef6b2abcdff28034533b7e4fdbc928fa3051fc1aa03010bc3c2a2 SHA512 ad783b8a36af0a40358e45b974233011878dbd69421e5cb4faf2b6014706f4866aca0f36fab10248a054d35c6eadf687840eeb0091f7710146df78989964acb2
 MISC metadata.xml 352 BLAKE2B 974073c519d9cf6956092445baf695d8ad86681b2fa359ee5e9671be96cd74a6f94d9d0bd6ee83122381a64a3b352b69b81a86ee31f6feb8aad460679d3d6413 SHA512 ba06f1bcbf2445ea006525dd5bbd6dc9d7fb62dbc12dc90ca9ba5c9cecce3cdc9d4dfe31ba5e7a11128de4ba82e97b1b37b7f3240db1cd932c6165bc28f22324
diff --git a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
index 0e4154f69a6a..79b47d6e4377 100644
--- a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
+++ b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.washington.edu/imap/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="ipv6 +ssl kerberos clearpasswd"
 
 DEPEND="!net-libs/c-client
diff --git a/net-mail/uw-imap/uw-imap-2007f.ebuild b/net-mail/uw-imap/uw-imap-2007f.ebuild
index b0baee1ca4e6..064833e3216c 100644
--- a/net-mail/uw-imap/uw-imap-2007f.ebuild
+++ b/net-mail/uw-imap/uw-imap-2007f.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.washington.edu/imap/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="ipv6 +ssl kerberos clearpasswd"
 
 DEPEND="!net-libs/c-client
diff --git a/net-mail/uw-mailutils/Manifest b/net-mail/uw-mailutils/Manifest
index bb9675a92cc8..78e4342881e5 100644
--- a/net-mail/uw-mailutils/Manifest
+++ b/net-mail/uw-mailutils/Manifest
@@ -1,5 +1,5 @@
 AUX uw-mailutils-2004g.patch 1210 BLAKE2B 26b0c30fa9aaf35aed40ba84c9f4cc4bba757f05d2d8ebd29dd7dd8d06234cc2f5c2b7ca7509781fc67901881943c634956e18a1cd79a6f20e89822e5fdbe00a SHA512 af99ee3d05cdd81549d258d392bf6cf7948577b383ffc3a0314f39a86b36f48abd8194b91922dc40518ff6c61dd1d2258fd9281954222d67b667b8868569718c
 AUX uw-mailutils-ssl.patch 391 BLAKE2B f2555a5d65f2e447477909a3cc1d9456080900cc3ef8fca19730565e791e46ff22da6ac295fe2a4bd5e0d02a48d79d3c3275ea0df88c79e13b134b578162ff9a SHA512 4fcc9930209f728b901565cda00c2a4446a024bcf1abfe5928399f62bf5540f56ed449b6ff401db09eb53b61e4c6bfd4a97da2a67a2942ff8a4394530eadcffa
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD uw-mailutils-2007f.ebuild 1212 BLAKE2B a417f79c28a9a489cb9c968292841f644a83fbebe2c9d4c9e500e1d651301c9404ccc1388f1fead608625d1a3115e2fcbb505cea0bf6ebb447974a9ce73abb8f SHA512 c6ac7afa6009c8163e33d18d7a530761e7dbce2034f8c81c48ed413b58cc2d0b00204bea81a2afcecce1b55e6cb55acbd52c52f1a78319a51a3a8c56c6d59395
+EBUILD uw-mailutils-2007f.ebuild 1214 BLAKE2B 0a22765e242b781401783690c8a334c2ef9c2d4eccea2cdbc2b90ef79ced2a906a6702b007b31ab60e17f582702a3010fccc37ee9799cfe5b743dd1f28e68168 SHA512 248f92bbefba0912f1cf18fa4697e2f84981f11ed5a27859d5898e019f7d3f40cea0ef7125bf320140019117c0a1afe3ac11c52a85282866c3c493c969e30ecf
 MISC metadata.xml 354 BLAKE2B 41dc3c3482db345150e200b4a365487125aa45bc0145aa602abf6de7ec7189172600c410dd6ed93d55f8947aab56d5d9d9b2880f7576b8e5d67b8e7968ee9df8 SHA512 f07c546c9558055933bb275a504a7a38f15343ca89cdad8aded334445022ea7775b7c4ec6b7cee59faf2cd2d86e2b9f35c5dc07ce00eb8481e54c24231708977
diff --git a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
index 55ed9cd6938e..6939dbfc754f 100644
--- a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
+++ b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE="pam ssl"
 
 DEPEND="pam? ( virtual/pam )