7 files changed, 259 insertions, 290 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 0606bf8e1117..4d413a92aa18 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 43fd5a9f67fe..6106b285ade3 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -23,11 +23,13 @@ AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d1911
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
 DIST courier-imap-5.0.10.tar.bz2 3324560 BLAKE2B f59034184c6423ba4c8a238e1756e431bc240a5e80db5abc62af10eb776446f7c6afcba2935dfd49a7cf5dfec83087f3cdfe98785b13faa23287b0c6d24a9bd9 SHA512 7b1bd179fb7d9ed99ea4a92414e13d1313d10239bd1d7ddef76d17bb618e6dfd5d51f11d1fdb2fcd6a204a5000e3756ecb30aa2c791c6063ab3991dde65a3590
 DIST courier-imap-5.0.11.tar.bz2 3356907 BLAKE2B 6d4aa2d67ef92b318a87d8c71232d1801d908143c044f03891c9130cb8458958c4c0cbcd214d4f548a2e5e247a37120d1e824469c7b77b8e02d1f75fe2a77e5c SHA512 5fbadfe3a554596a1fdd74648b002964e18d933209f0b832c4782a242c5c76336274756dcd6cc086f55ab66ba4a7292d6d5b9bfe84c0d776f6b3b14d7531bedc
+DIST courier-imap-5.0.14.tar.bz2 3359363 BLAKE2B 23a734494ee3591b33361f209a465a54f893dd5ed30295fbda4d11707664f9750d5dd422449ff4a159a1fa8130d201bb50cde3fd56051293c45fe53d62c8ed41 SHA512 fa6feb9c6dc04a53e569cb0fdbf34cf4bbccd890cb827a4a0948bd221eb41834033cc7cb7b4c03e8b21c5a59545d73b845865a4da464c1b1b546f70805b18c31
 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
 DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c
 EBUILD courier-imap-4.18.2.ebuild 6867 BLAKE2B a89f1c91bf57eb8d1c3d1daf5d8f7e614b5d2cbcfb16fcf2b9a0d659b36d069d430106569ff5a114bcdcde01e5c48647eff80a54ed3ed765963048acd60daef1 SHA512 c9f3dbe5ea757a7a834b90cbdc05acd9811d1fccc0762e4653f9c70afb11024c20c7caa0c1cd7afc7c9c7b7ff69598eec33a7b2a07f7dcc2ab486b85d6bef389
 EBUILD courier-imap-5.0.10.ebuild 7241 BLAKE2B 6ce8c2e5da5c49ac653e62174937688b17663d19632920fc04c6d27675dc2878699f9f37075c2ca530a1fd4a5d5d48f74d78df8d7a4ce1a1c93d784d72aa0a4d SHA512 de16c3a52f8821f2ec9496209be0946df8149e605a3f9894ace4634253f2a2a18525e62eb5f4ad8fe5c1b62e99ffb623b28129a0331c6fe5237d45b7d658fff1
 EBUILD courier-imap-5.0.11.ebuild 7273 BLAKE2B b53b05eb7a25be57c31bba7cf3c52e6689354d17270ac6d33f46d26a36638a04ed687693a1b84bd4d879b5516adc1bc834ff05600b04ae445a19f774d6041bcb SHA512 4cbd94e66b07cc82cd190b05fa3522d95cccd3ceaf5eae59e06d3428dda9620963a52bd62400b646e4b176c5f5072065fbd47ea762f35eec400c056927618d47
+EBUILD courier-imap-5.0.14.ebuild 7241 BLAKE2B 04492f43161ff74e7e235e5029aecb304f6c2d7d7ee6eb7d62b9ca9fba8e84d272b98f27a747b5e04e802d089053c0faea5f9d7e7889a1c064d248350b68ea4f SHA512 4feda04f2da3073e36c4d46ab8f29b3cf5b366bb7cef6b7950a294c7cf299c3141e455763f7f671a256cb32de35bb1e2f05aea91111c6182fa912923f8713121
 EBUILD courier-imap-5.0.7.ebuild 7192 BLAKE2B b837f5e1fa3bc6bff54dfa3d2138ddc6ce951dcfcd5fbae2181a02eb1436dc25ce3f902eb05a80f29412a45dd593adc7f1618a4dd733727d0c1e793f2268654e SHA512 269e8c6810978ddfd59c768b591ae88d4ab31af6aa2e0e8a0a05913bd8afcbf754e279d090d8facbe6cc8cb4c81f5b17f76704c972e4694ca0042111732a9438
 EBUILD courier-imap-5.0.8.ebuild 7234 BLAKE2B 85d1b623155d06c51cb34c07d39b056688b591b7c496c0793112c477bc1051585386ba6783a761e76cb6fe2f71383ab3e2251b43823e2d8cc98b827646eaa3b3 SHA512 79d89096d502a8491cc5add10a108000a19a282fb746e12314d11ed5a29bd3623bdf208b0cbf4ccf741db2db47d170ff19cae069ec4b224011095f7580b28e7d
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-5.0.14.ebuild b/net-mail/courier-imap/courier-imap-5.0.14.ebuild
new file mode 100644
index 000000000000..efa94a72c726
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-5.0.14.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool readme.gentoo-r1 systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/imap/"
+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"
+
+IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+	gnutls? ( net-libs/gnutls[tools] )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=net-libs/courier-authlib-0.66.4
+	>=net-libs/courier-unicode-2
+	>=net-mail/mailbase-0.00-r8
+	net-dns/libidn:=
+	berkdb? ( sys-libs/db:= )
+	fam? ( virtual/fam )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	!mail-mta/courier
+	userland_GNU? ( sys-process/procps )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-courier )
+"
+
+# get rid of old style virtual - bug 350792
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap
+"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+# make check is not supported by this package due to the
+# --enable-workarounds-for-imap-client-bugs option.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
+and remove TLS_DHPARAMS from configuration files or run mkdhparams
+
+For a quick-start howto please refer to
+${PN}-gentoo.readme in /usr/share/doc/${PF}
+
+Please convert maildir to utf8
+and rerun mkdhparams if needed. Location has changed
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
+	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
+)
+
+src_prepare() {
+	default
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
+		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	econf \
+		--with-notice=unicode \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--sysconfdir="/etc/${PN}" \
+		--libexecdir="/usr/$(get_libdir)/${PN}" \
+		--localstatedir="/var/lib/${PN}" \
+		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-certsdir="/etc/courier-imap" \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+}
+
+#src_compile() {
+	# spurious failures with parallel compiles, bug #????
+#	emake -j1
+#}
+
+src_install() {
+	dodir "/var/lib/${PN}" /etc/pam.d
+	keepdir /var/lib/courier-imap
+
+	default
+	rm -r "${D}/etc/pam.d" || die
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	for name in imapd pop3d ; do
+		mv "${D}/usr/sbin/"{,courier-}${name} \
+			|| die "failed to rename ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -e 's/Maildir/${MAILDIR}/' \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR}
+	# to them.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv "${D}/etc/${PN}/${service}"{.dist,} \
+			|| die "failed to rename ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for x in "${D}/usr/sbin"/* ; do
+		if [[ -L "${x}" ]] ; then
+			rm "${x}" || die "failed to remove ${x}"
+		fi
+	done
+
+	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
+	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
+
+	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
+
+	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
+			> "${T}/${initd}" \
+			|| die "initd libdir-sed failed"
+		doinitd "${T}/${initd}"
+	done
+
+	cp "${FILESDIR}"/courier-*-r1.service .
+
+	sed -i \
+		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		courier-*-r1.service \
+		|| die
+
+	systemd_newunit courier-authdaemond-r1.service \
+					courier-authdaemond.service
+	systemd_newunit courier-imapd-ssl-r1.service \
+					courier-imapd-ssl.service
+	systemd_newunit courier-imapd-r1.service \
+					courier-imapd.service
+
+	exeinto "/usr/$(get_libdir)/${PN}"
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
+			> "${T}/${exe}" \
+			|| die "exe libdir-sed failed"
+		doexe "${T}/${exe}"
+	done
+
+	# Avoid a collision with mail-mta/netqmail, bug 482098.
+	mv "${D}/usr/sbin/"{,courier-}maildirmake \
+		|| die "failed to rename maildirmake to courier-maildirmake"
+	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
+		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
+
+	dodoc AUTHORS INSTALL NEWS README ChangeLog
+	readme.gentoo_create_doc
+	dodoc "${FILESDIR}/${PN}-gentoo.readme"
+	docinto imap
+	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
+	docinto maildir
+	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
+	docinto rfc2045
+	dodoc libs/rfc2045/*.html
+	docinto tcpd
+	dodoc libs/tcpd/README* libs/tcpd/*.html
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/${PN}.cron ${PN}
+}
+
+pkg_postinst() {
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
+
+	readme.gentoo_print_elog
+
+	elog ""
+	elog "Courier Imap now run as user mail:mail."
+	elog ""
+	elog "This require you to enable read/write access to the caches:"
+	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
+}
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 5f6f2a0f16cd..a68614eb7795 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,7 +8,6 @@ DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac
 DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc
 DIST dovecot-2.3.13.tar.gz 7456073 BLAKE2B 6cf3e7d9c6cf90279e0d72782cca88a11617f3f08e3c27da7948f46b8796575e42c776323cd56bc4208474831d4480afcac35ebe0b74d99db40acd4cda2279be SHA512 758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95
 DIST dovecot-2.3.14.tar.gz 7483769 BLAKE2B bf2606ed64bef66fdeb165da65295031e692b7ba5186847c027adbd50093a9684b57eb724595c27838d91769e097ab2a82978ba845bf4e026dcfd78aa1372501 SHA512 69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103
-EBUILD dovecot-2.3.13-r1.ebuild 8570 BLAKE2B a4e47fa9966ba40e3a946b76b16c802cbb9e6cdf00ef9a7a7d0bdec0cbccb4378068047e23eeb2ed074fdffc1ce785bb0785a97e968032e65e4cd1047c73da70 SHA512 32493e86c673e825b0314cad476866c8515c511e13b975eeae1d3ddf6c2bbacf77ba34b69bd48d6d08dd1a52f53eb6d64ce1ee639f2c9154d678134ee9ccca40
 EBUILD dovecot-2.3.13-r100.ebuild 8826 BLAKE2B 69dad01a47d80c16364924fc530bfd03e7ac1682501e0dcbbd559a322dbc45808bf93088d9899cadbf8285e83686cfb0aadd9d3e353990381a6f949af9de3ab7 SHA512 f33a85cddba83aa39c27290740cacfcd82b3d0b46e8a103dcaba979d5524eef8c9dea619e3b293a5706ed2439d67ff632f7dfd1a1859b40cced632cdedd735d1
 EBUILD dovecot-2.3.14.ebuild 8732 BLAKE2B 0db42ad38c5a6601ad0b0dd6572f82f383949bda56958241fcb7fc3e6afa2e7831f6abd9155e80b02ecaf6203fc0cf4a59c409f6e0ef49b6ba01b3fae1996865 SHA512 c91c5babf6973aa919ccc623c231a5b363d78db82c48f85420286b0e9302a4e319c4696273a6a7bdae397b7ba11da2a18a6f32b374d718742ad9307d27227993
 MISC metadata.xml 1025 BLAKE2B 8b0f7c2bbb9cfd58d34cafaea132e3d52236f91db59e53a91c0816f12813311b9d9e6d19d2341a044a4a2af5ed961eec8417d0df6826a8cbb02dff528f3cb533 SHA512 0175bb9a54384bf69d99ace11ce8a76dcca1426e4a4edc3a3e6404a0dc1bed8f6912add47735d1924410dca2d80fcfa8c9cab4df4dc7ee25f4dcc1ec004f8665
diff --git a/net-mail/dovecot/dovecot-2.3.13-r1.ebuild b/net-mail/dovecot/dovecot-2.3.13-r1.ebuild
deleted file mode 100644
index 0fa54fee5f92..000000000000
--- a/net-mail/dovecot/dovecot-2.3.13-r1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.13"
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${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:0= )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
-	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:0= )
-	suid? ( acct-group/mail )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	acct-group/dovecot
-	acct-group/dovenull
-	acct-user/dovecot
-	acct-user/dovenull
-	net-mail/mailbase"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-unwind-generic.patch
-	"${FILESDIR}/${PN}"-socket-name-too-long.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
-}
-
-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 unwind libunwind ) \
-		$( use_with zlib ) \
-		$( use_with zstd ) \
-		$( 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 "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/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 /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 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 https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 0923204ed588..1a45cca1271d 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -4,7 +4,7 @@ DIST isync-1.3.5.tar.gz 316671 BLAKE2B 3018236aef71e7eb9dcb3c0ce4dee208a6b53060c
 DIST isync-1.4.1.tar.gz 336281 BLAKE2B cb15a8c0dcadbc3db072fcb10a6f0d83ccef0de1c49a9d30a7c189f616c965d8e759a72c4e35927e20e2d7995f9430bffa22e535684a7b7290516d8bc78bf071 SHA512 87d1101d3e39680c1d101653a6f48859d539f0d37d65db8d90566fae22f2163c76907d561b2a487d3ed2ab459c5703fa8e077cc3e1f156a895d7ef9078af91e8
 EBUILD isync-1.3.1.ebuild 859 BLAKE2B bb36f26b449eacdf714b047e8ab0facbf6487fa1abbe1e2e054ef2775486e9a0fc2af67f701281ecd44c15096daff32760e2360ceefe29cab363ee4924a06f20 SHA512 673c7da19bbab310ba3bb451d274ced14b40f68527828d2fa0fbe551edbd87cb3384f9d6441bb8c81723d7caf779d93f4f34caf7cf6bf4f973147ec992bc3701
 EBUILD isync-1.3.3.ebuild 868 BLAKE2B 950ddf7a95e06e272bad96255922e667176856d73d1a9e01ae99add5a1716f78d60db9b3f3b575fe406b58a48db99f626118a2af5bfda5508a4dee8473bd3c9f SHA512 39af3a19cfaaebd9835fe35c23f8e557ed54762e53ee54bc5af456125875bc51577de4a2c68c6a19b277405d25e7f3bb35b6093cd9538e11abde7e32d826ddd1
-EBUILD isync-1.3.5.ebuild 870 BLAKE2B 622511f268094f7bd37473eb581a1766345b1f14d3033d6ee4217b403cfa4c2290a1d0139fa02a8f0dd00dbf248f54268bac72a71fc0481ee0432cc632274a67 SHA512 5ee25308a100fd6135cb4335fe72678f1442de7a656b3c019d0dd3019ceae70a883591269db0c3f19f48b60c632849620eac17939f9c6955998daf20fbe289f6
+EBUILD isync-1.3.5.ebuild 868 BLAKE2B 950ddf7a95e06e272bad96255922e667176856d73d1a9e01ae99add5a1716f78d60db9b3f3b575fe406b58a48db99f626118a2af5bfda5508a4dee8473bd3c9f SHA512 39af3a19cfaaebd9835fe35c23f8e557ed54762e53ee54bc5af456125875bc51577de4a2c68c6a19b277405d25e7f3bb35b6093cd9538e11abde7e32d826ddd1
 EBUILD isync-1.4.1.ebuild 870 BLAKE2B 622511f268094f7bd37473eb581a1766345b1f14d3033d6ee4217b403cfa4c2290a1d0139fa02a8f0dd00dbf248f54268bac72a71fc0481ee0432cc632274a67 SHA512 5ee25308a100fd6135cb4335fe72678f1442de7a656b3c019d0dd3019ceae70a883591269db0c3f19f48b60c632849620eac17939f9c6955998daf20fbe289f6
 EBUILD isync-9999.ebuild 870 BLAKE2B f53cd1e1bd39fd318159f35dbc507a444a4a07e0d323969971496ba6995af6237dcf50670c8fa1998d9322cbe3069f480c4cc6735ac25bda80ecceda5807a3d5 SHA512 6aabbed6126f463ab6e865f5c8e74fab789648aa9cc81a0bf8bddf9477bbf9e237066b443c2e8aedf9aec56727ff904f9317cb1489c69491cab7b45465b0da38
 MISC metadata.xml 295 BLAKE2B 018d8692cf8398f0fe616b81594313139e4a2e8d07724fcca621ae325b0ecef76bed8c9142847483240cb5b597c936600152ce92ead3de8ebc66c74e7fd89039 SHA512 74a5fc01fe3cf7826ba041fb90bb6aeb3c1a1e4ba8f3807a17a3defc08d5e2f507f88ac52a458b9707fa5a877dd3f63210227a7637fcd35574c09e073896457f
diff --git a/net-mail/isync/isync-1.3.5.ebuild b/net-mail/isync/isync-1.3.5.ebuild
index 652bed336e03..fbbaf6e51b02 100644
--- a/net-mail/isync/isync-1.3.5.ebuild
+++ b/net-mail/isync/isync-1.3.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 IUSE="libressl sasl ssl zlib"