gentoo resync : 22.12.2021

16 files changed, 323 insertions, 91 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4f04cc6cf273..93185c544286 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 5a0ab7fc5fed..75e17ea5f46f 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,9 +1,6 @@
 AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
-AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
 AUX init-r1 608 BLAKE2B 7d2b93482c62fe0219c7194279ee495274e4b0b8319ccf2d24e7816abe7eb23452bc21c01305283deeb8224c3668641b1bd5a7f3fbf8fe783a28e58268511ace SHA512 4a1ed2c45e1414734b8e5cbb731377da2087bd4f1a1075b4acb81b5057a65c0557e9e1a05cdf6856da35067a589d9c56fcf13156e8872facfc8f161bb3cade0f
-DIST automx2-2021.4.tar.gz 170903 BLAKE2B 9c8e9bc95eeac9a8a59430248d532d540e70a40c4d61f006d5d2649198e856e4b404ed75df745cfb06887c58049a9a233a597059e2f2971bf9f1c8ce65a34f3d SHA512 f306bfdca10dc884bef404e5ff24181dc9adfb8514fd0e0d984bac84ca4996f0978eda7161be46f1b3d93a9c0e61aaabdfb4b2886012570a51ad0aaf2286dd2c
 DIST automx2-2021.5.tar.gz 172317 BLAKE2B 501dea5561d780fed538676e41dac46da01bae24388f477afa66e1b27e8a271e48bd6bddc8f9a4e0f5e7b3eb9f58fca9a9b2adaf78de2f7cd2feacfc8f85c9a4 SHA512 00281f32df6b117690d9780b8a587907518e2485dc37450765c3f35acb92a27da73ecd4e35cd05e0a5307d179ba3edaa1dec80900a059c975589ae904456c565
-EBUILD automx2-2021.4.ebuild 1201 BLAKE2B 757048d7aae1e660219a7ad146e258d6d59138cc71d15ddf63395f305468e3c943e2c9818d3577efa957b163beffdab8f1d16fcfcb267bc53bc83cc6687f60c5 SHA512 2c91a5c291483e62bd7e1e9ce1e67f66aaab37491313cd1f56aff426d7340b280799cbb221df2266125cbdd21685e86724d663542822fe6b659206da46b401e2
-EBUILD automx2-2021.5.ebuild 1155 BLAKE2B 5b9dc245ea033a3d7d2d29c5e09c299dd8f95bcca7cdc8287c465ee15027c00066a7e0cc49e87dd45639bf2d929e748aeabc0cddb040d1583326bb4f21b7e661 SHA512 252be12596b4616b2476f7876f0b46f7e32d95b98e8265d5d9024bd922eb3d2a1eaace554e3a1d318aa3ef44f59dcf171bf4a90d942269d45665d5fed86d392b
+EBUILD automx2-2021.5.ebuild 1154 BLAKE2B 1e6275ca534940d430931f819afbf35473b5f476a26b9afd23325f8cc8839e341cc17f9678a639b8a8fa85af663cbbc51466b2b4dfcdb17e85c55d6411fa8a1b SHA512 32c929a2f4affa8695c4b1f4fa8758dc990f7c41547127f67cc9aac791ed9236508608e3520d64b4ff034a9fcc6c6ed62c17c66fa196334c40cd8281893e1456
 MISC metadata.xml 918 BLAKE2B 8f693feed959a0394e8be4a0f489c4913e142aaec8e71920fc0ace1e3ef1f8b5c79a312139bca612c3d204854f6e222252b25b1343539829f3950d1ae344483c SHA512 77e8f20c9af068189d12ba06ac566d03f8b86435b3c88682c6819975fc0636e4e427ab07b76db9d0e32a5b51b7861715c60209f6ee5ae0d4fb0a19a53c4b98a0
diff --git a/net-mail/automx2/automx2-2021.4.ebuild b/net-mail/automx2/automx2-2021.4.ebuild
deleted file mode 100644
index a5638470334b..000000000000
--- a/net-mail/automx2/automx2-2021.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Email client autoconfiguration service"
-HOMEPAGE="https://automx.org/"
-SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="acct-user/automx2"
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-migrate[${PYTHON_USEDEP}]
-	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/ldap3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -i -e "/('scripts'/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	export AUTOMX2_CONF="tests/unittest.conf"
-	${EPYTHON} -m unittest discover tests/ || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		DOCS="*.adoc doc/*.adoc contrib/*sample.conf"
-		HTML_DOCS="doc/*.html doc/*.svg"
-	fi
-	sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}"
-	newconfd "${FILESDIR}/confd" "${PN}"
-	insinto /etc
-	newins "${FILESDIR}/conf" "${PN}.conf"
-	distutils-r1_python_install_all
-}
diff --git a/net-mail/automx2/automx2-2021.5.ebuild b/net-mail/automx2/automx2-2021.5.ebuild
index 053aba45a4d9..a7e9a55b9381 100644
--- a/net-mail/automx2/automx2-2021.5.ebuild
+++ b/net-mail/automx2/automx2-2021.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="acct-user/automx2"
 RDEPEND="
diff --git a/net-mail/automx2/files/init b/net-mail/automx2/files/init
deleted file mode 100644
index 466461a6cd93..000000000000
--- a/net-mail/automx2/files/init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${AUTOMX2_CONF:="/etc/${RC_SVCNAME}.conf"}
-: ${AUTOMX2_USER:="automx2"}
-: ${AUTOMX2_ARGS:="--port 4243"}
-
-command="/usr/bin/python"
-command_args="/usr/bin/flask run ${AUTOMX2_ARGS}"
-command_background="true"
-command_user="${AUTOMX2_USER}"
-pidfile="/run/${RC_SVCNAME}.pid"
-required_files="${AUTOMX2_CONF}"
-
-depend() {
-	use logger net
-	before nginx
-}
-
-start_pre() {
-	export AUTOMX2_CONF
-	export EPYTHON="@EPYTHON@"
-	export FLASK_APP="automx2.server:app"
-	export FLASK_ENV="production"
-}
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 453d9073aba0..9c4ab2478cb7 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -5,14 +5,17 @@ AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed
 DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc
 DIST dovecot-2.3-pigeonhole-0.5.15.tar.gz 1935601 BLAKE2B e26405cc9a93681206e27c2b548e3409ae4444c1c011127b27eda364fec27d572dc01c7ea63688693bde10a8b4086bf67e14bb67e917d62db426d8871d6af0ec SHA512 521070080802bf2a50cd0ff0af5dc991c04d70b807abc2cd9aa567444a4869f5f42800f19d9b740a519bd4069437139e70ca6ae4b905479fcec8faa133ac5f54
 DIST dovecot-2.3-pigeonhole-0.5.16.tar.gz 1944573 BLAKE2B a859c396126132669793c73c695380f24f1ca205b8153cb5f60f3be37194c48ae7d0dd6a7bd37fafdd9e95dbcdc2ab341146883013c63c1b5ccb5a9bb4b7b9ae SHA512 880e00654eab85cc41b27ac470cce6011991e3cdb005642f495c2297fd9492bfb2b6b4ef63c88c2ac10bec870ad69b8bee6b11dd1bc5099e16c3cc2857312543
+DIST dovecot-2.3-pigeonhole-0.5.17.1.tar.gz 1952704 BLAKE2B 7dfc6b5bdb82bcaa60e0f41722f9a884edee7853ce09c9391d4c610be16728f58cc7095b8dd2d47e89296ff36aa926c687b39a418bc74ca0bfc3c4eab98156df SHA512 632a963d90a3fa052f314360d59ff25274d80952307ab5dd9193a2713ebf686500a7b2559b56f04b07e0a261066eed9b8525b14197f3be51728af09acb76e894
 DIST dovecot-2.3-pigeonhole-0.5.17.tar.gz 1951089 BLAKE2B fb91e668cf56632b749fed6e9c620b591bee82b19e928dd4cd3dca657dff6938ba4ae4776713a98b0ae38c17e3d6a613b35971cdbae792e18d4563f5f7efaaff SHA512 c4bf69504ec22de53bfeffb55fc95438fb0f648390ca6e6485f652e2e74a34cd7508390bb595b958cbabc53f0e20fbc42e163b2682dc65159fae2acafbd94bad
 DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35
 DIST dovecot-2.3.15.tar.gz 7608561 BLAKE2B 85134064dbff0b4f50831a835fb6eafc92081d75d91ab331fa0ae79c453382a88485bad8c774491968b879478dc66841a9c6170e5931d562cf5eaa6af755440b SHA512 75bbdbeac663da109f78dba06c42bb5193e911c6b3c64f055fc4473ae9afaf0c8304c49fc7f06c5c6b61e67dd13dc21fbed6ff160a99f38f547c88ba05e6b03a
 DIST dovecot-2.3.16.tar.gz 7650008 BLAKE2B 682067330e94a51a6bc6c82444a5e29a08d6382652a531597bd8c3eecf0bd86f6d4d1bc20e0467c36d5285e9df5ba25aee7dd6db727d195f8f67ac403becfcf0 SHA512 31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e
+DIST dovecot-2.3.17.1.tar.gz 7700848 BLAKE2B adf12c84def899795d8446766b5c88fd5c68a5969a1807b4dd9c2e4894ddc0693a771ce4d4c0c72b0b03501903c39c650eace97b6708114b7fe038b62ea2ecce SHA512 976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79
 DIST dovecot-2.3.17.tar.gz 7699294 BLAKE2B 1dd044abc9cf27aa8ced5595d875a2b08abba93b43727db6ab1508ae4a841cada57a53d76bf318f497b61f0dbefad66091e652e4b73a4b25d37a763e31a2241b SHA512 5b45d0f2f8af5cf095aff35f8e6a74bbbfd153b6e4596510eade671507d77476544e3a012087b4d4432c0399601f29a49cdf8b34249438f440031c8d027d1cd3
 EBUILD dovecot-2.3.14.1-r1.ebuild 8699 BLAKE2B 025b31d9339716d42205d8ba732895affc49f3ca967b2f5fe07f908e0af64a06da4da2e2c06f269b4994a784007743c2ff8a0cac4aa73c223bd9b3f1dc6f9635 SHA512 52cecfeb9b0a6c7cf422ad4ee30dba6bee0e6b813ba43514bc62d899763a470c71b50c83e063867e8bd5b4a0010b8a29d5dbeaebcb9b51d8d74864d5483de89c
 EBUILD dovecot-2.3.15-r1.ebuild 8858 BLAKE2B 15b3b8ea8586f1bf5cee1e6ad7b262f7816ef0b251464aeba84b30653f4b8cea91ff121ba620cc93026d9a7b056e6a4519f5b76f4482443d008d88e1c4033b78 SHA512 cb4dce94e90ae5845981a625767a2f5625d85cf57c47ee19c07b46297a8cf1b6d37b3182ee0a804eea25c4520c6902311f322d4ff81f9858ff3bcca080e5cff7
 EBUILD dovecot-2.3.16-r1.ebuild 8862 BLAKE2B aa62494061ac369981982cea2c43c9e0f18ba5d98bab0b21bb83a43a99035caa9e998c1ec929724ed8e10f74ab33e636f22ffcef733f112b227a40a3544db7a6 SHA512 1da9964f1effed2f2423cb27b929ee9ae715807364d6ce2c8a9d45dad7f7b5d21389b2d132b9879aff1b077a821de20ea242fdfc295ed9f00f8a4d1ff23d4a97
 EBUILD dovecot-2.3.16.ebuild 8882 BLAKE2B 76a6c3bebab81278a54c733e35e33b9b8ddb8cd61c9999ca3f0c59b195d3aadcc84ded551ae30cac1ea0a173b9f240b8a18b97e05898bc9b690f94fee0e16880 SHA512 c89b7b723b14d42d203acc8fe8331b00f0b696792a93a162184e309a034cef5b89765507e0a20d133508b70c8dacc1ec19f3c68c92eea78145c29a8725f1b045
+EBUILD dovecot-2.3.17.1.ebuild 8864 BLAKE2B 5b0ff4c44eed53cefb3fed6b359780591642f08899cd60282c857d43ecfaaba6e24c99bb325634c71571ea6ac79dbc2f5a78b036f6de3c77b8d650ccb1986ec6 SHA512 ae19bc3a26950d52add8786efdb36594e240d75914d0df275690255015781ccd34179b0ddddd7dbd564995240744a966f17394511692b0689fe60f6068ea1d2d
 EBUILD dovecot-2.3.17.ebuild 8862 BLAKE2B 9474282e1c8e8d9155d0f2ecf61dfffee6284f4ae7555162704a141f87f27361e8b7690e727b527cc5cbf644c755ec9e3da55955891148a84443d8a418720ded SHA512 d02d4dc1c03afe610075bedcbba97d3c4558226b67be95750330b85f51870fedd9ed06ebe6892a87330da61d907b960c87294ddbd0dc7f81da9c394f498eed0e
 MISC metadata.xml 1091 BLAKE2B 5852eefa5b3be607a1e7d1bd5e8aa8ce2317db6ccc8c915438ab1aef54d59d2bd6953b1015c429a391c4b7cf69bdb562da80bfd66451dc40f21cc5d6adc28c10 SHA512 9eb91f5290af634e94abd0d1542c88c69da77f892bb15cc5a90d461cd456df5c68f4c9b783a63705297e88291c7d9d917a9adcfb55a32fbc04da82ae0528dad3
diff --git a/net-mail/dovecot/dovecot-2.3.17.1.ebuild b/net-mail/dovecot/dovecot-2.3.17.1.ebuild
new file mode 100644
index 000000000000..9eb939c223cb
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.17.1.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 lua5-3 )
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.17.1"
+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 ~riscv ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="lz4 zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
+	selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/icu:=
+	dev-libs/openssl:0=
+	sys-libs/zlib:=
+	virtual/libiconv
+	argon2? ( dev-libs/libsodium:= )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	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:* )
+	stemmer? ( dev-libs/snowball-stemmer:= )
+	suid? ( acct-group/mail )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	unwind? ( sys-libs/libunwind:= )
+	zstd? ( app-arch/zstd:= )
+	virtual/libcrypt:=
+	"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
+	"${FILESDIR}/${PN}"-socket-name-too-long.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_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
+
+	# Bug #727244
+	append-cflags -fasynchronous-unwind-tables
+}
+
+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 \
+	LUAPC="${ELUA}" \
+	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+	econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--disable-rpath \
+		--with-bzlib \
+		--without-libbsd \
+		--with-lzma \
+		--with-icu \
+		--with-ssl \
+		--with-zlib \
+		$( use_with argon2 sodium ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with stemmer ) \
+		$( use_with systemd ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with unwind libunwind ) \
+		$( 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 ldap ) \
+			$( 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 55646e479223..b33eca3f4f4e 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,6 +1,6 @@
 DIST isync-1.3.6.tar.gz 317174 BLAKE2B 3a230cd4bfac061ceb3325732c336ccd808a662989d2fc81459b4b27fce927a62e335200ef233f63d28b80f6ba79b1e5e102fda8ec68c9cd8e368f8ddd7188a0 SHA512 16e859361b27f00e1ef9eda0a2d06edf271b2643107a1f90c90713c34ffe9b542cdedb31218db72db633e12cf39a6aa2ac509333647c79a1825faac8ad4ead38
-DIST isync-1.4.2.tar.gz 336940 BLAKE2B d37dea100c5a994ce65812612a9571fe5649168560799ae17ec866774bb46b4ff989a87f4172a24006f0704e4387260716f4811f6e765df17719e598064119bd SHA512 4f95e06c5bf159b7bd8fedb75e72a8f08ee0907362dde068347706610ed251eb511b00281711ddd40a0ece31dbf07f07487cd4e5504f0898638870c51a506853
+DIST isync-1.4.4.tar.gz 340544 BLAKE2B fdf38b1066af10315b780897f1fe09c8f7d0b4d2202383a5f0ef24b98f11dff625bf178bbb0dc846460f661b18f923d2823bf79643d4d376b606b03980f22e18 SHA512 b769f474f2296764cabaae7e2b23e47c22714fca5919e9f1c916ed70b18c71c0bc9301fff0f64434f4f0ae28c9d16216e72556b48014ec94d1b7646de7183011
 EBUILD isync-1.3.6.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
-EBUILD isync-1.4.2.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
+EBUILD isync-1.4.4.ebuild 857 BLAKE2B 7b1e20661b45e8aa1accd4d9e7110bd460d61ac7d94ca4632bdd060beb32b4dc1130988fb27227576b749336443abe57a257af83e0f5f4049dfa85e7456d8147 SHA512 a133014d6c37fb17d8a0922858265d42da20a0c6fc7f3a3e5c383ff9ee4a35683e227ef795e1955393b41a190f9c395bcc6ae8fe1e375b084546014f36a96dca
 EBUILD isync-9999.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
 MISC metadata.xml 377 BLAKE2B bf6ebe92478a45a3e364cdbf971f339468b87cb07f5206aa0db1e00d03bd1bfb920f1df1be8547d8d668e474de38d29ff9902e0411b816e7c7b190ba66bcb90f SHA512 030ed2e882dcc1b89eb2ecc330964636e9dc6fee7c90e64a34ffc0046f0b11a2df51d74d5869ee4728f0b6d41abe016983ce16aed6928a6a917a88fc9d68a407
diff --git a/net-mail/isync/isync-1.4.2.ebuild b/net-mail/isync/isync-1.4.4.ebuild
index 07b35974fe65..8b349d1935a9 100644
--- a/net-mail/isync/isync-1.4.2.ebuild
+++ b/net-mail/isync/isync-1.4.4.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="berkdb sasl ssl zlib"
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 24b5abe9c51b..15c424b58558 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -3,7 +3,7 @@ DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1be
 DIST mu-1.6.6.tar.xz 866724 BLAKE2B 3417d4b3e5bfae943558fbc936ca0207be912f9548621b1599437484e94f3b49271aa1e97e7cc2b5b6027b8e0cf97d3b96d2052772f7783d897b4fa0dcf03184 SHA512 07daf9864bfd1ff4278aee98a0ae9c4fc3be94468e3b2022ae801f048f339b5becdb9ad8ebb2e12b9131e0e6dfcfb541bdca8288657dc19d47b0e510831f54eb
 DIST mu-1.6.7.tar.xz 867136 BLAKE2B 12b19d15c01a7101e3a936b12ee87fa5519c0e047e354f2fd1d481939dd5dffa34a94a5e7f3fda20e27771377e78524065cf5f93f7a2f818e202cdc93090ebff SHA512 ceae7b4508fc607dcda0fc20e9fb92b3533b1ba7ef94823cba2cd3a6ad3f18ccd3d2ea7da20e4c190e53f2d00ccdd3e1d25e12b89a08bf5233f5656be90b3c14
 DIST mu-1.6.9.tar.xz 867188 BLAKE2B 526f67acd505a1d02cc12841d7d5f99e4b91a8aa3923cc1bccf045faf3a89bef99827c7461e78d000aefa48634a38fcf263346c14f275e3053c9774e2f8219c9 SHA512 c0ba5fc984fa445c44f89b84f911952c4a3aebf9484c60df75bd6a144cad3e68e1b2de98d8bbf5faae51d81ed99adb85280e4c1a40e7b0d587a00e0d80937495
-EBUILD mu-1.6.10.ebuild 1444 BLAKE2B ebcdab939aa5224eb1967f186e0ed1980ad57a96553b0a53372c3a2d19386d47e5651182f284375aa92a40e75879b2f155a4c9f4621b34068e1027efdd138b12 SHA512 8288d3b0ebf61bc90dfe05e4608c206534c94b22aa587874dd65b96d2e1ae281f0b45d847b476498124a1637b0ec340c1c6e50508c69489f0d0801bddec82f13
+EBUILD mu-1.6.10.ebuild 1440 BLAKE2B 3e3c39a2691959ac6502772a4543d87d1cf1c9feaf1b2c8d44a2459f782236fa6c96fb42c59e8aa7c409352060a5b5a85361d203f71b810094491cc7bfd2b6a8 SHA512 42341654db5689f0fbecbce749e8653ccdcaf25d7dacd69d531a56ef3782e1ee0f12e307c28cfb8cdac1b749220770a14919476c4663ab0c392f766c146f4909
 EBUILD mu-1.6.6.ebuild 1362 BLAKE2B ca704ccd04361f92723d13c12a9a97f744ad2715f79a406b1dd40848984a7ff256aa73f9e8c8656c7ca67b51a7a699ccce366ff0c2e5dc9a6cbbc57dce27219a SHA512 05b1a606d2821b1cfbd65e3c6377e30d82ae1d6878e276685d70e7b76d80183d14292d6131c3e28d4f1a4f59c80234bc1e41cb5092dfcdceb1e88c243047c7a5
 EBUILD mu-1.6.7.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
 EBUILD mu-1.6.9.ebuild 1447 BLAKE2B 1c45f7512eba7de8aa94f59d0fef1e5ce91449195ac88d005e411e4f14c42d43f277cb1c76b654cd3e6468fb25151f2b966907a419b127b92c52845b81e7efde SHA512 dc299eb6a94a090124aa1c16f783c81c49cb93b7415fb9b9e5a344d6d1453ba0aa8aeb72c4bd913887af3265545dddefc6aba2513c18207783a5bd9778c1db05
diff --git a/net-mail/mu/mu-1.6.10.ebuild b/net-mail/mu/mu-1.6.10.ebuild
index 10dba93b30d6..ce62a8d42dd1 100644
--- a/net-mail/mu/mu-1.6.10.ebuild
+++ b/net-mail/mu/mu-1.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 IUSE="emacs guile readline"
 
 DEPEND="
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index f3a169be6667..90e4b4064983 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,7 +2,7 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e
 AUX notmuch-0.32.1-tests.patch 4674 BLAKE2B c2eff70dcbf18a3276a97b3a9058f2a51647fddd6ef28ede2b1878aeb3ec3f6c5bfa5ac250c10f7cba3923031af3c4665a06190ab78b481448d9234e63e67594 SHA512 7870b5381b257cd9acc31c67f2654ecc711ddfde36c5f4a9969e43051eb43c1f0b716f926a85da4a8ec6c726bff1543cdcee9520e9b25eba2f8730bf206add5d
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
-DIST notmuch-0.34.1.tar.xz 748444 BLAKE2B f8e2d8041082a95832d0b5bf600b92b5de93e606d99ffdf38ad13bbd80205688780d64a4c64f1db3783eaa56b34f5fef1839430faf058aa5b92053026de06326 SHA512 ef1423e049a83f81fb6b5a75f9a35efc0381c661bbe00007dabd6b385df829ac4195137ccef3fa1ec652df8eb4566e3d9d30880a4c74497a9668cb3ca240fb88
-EBUILD notmuch-0.32.2-r1.ebuild 6727 BLAKE2B 51f07469163bbad95fd87ddae50f137920171185fda318fe2fd0b6b7cb09cd67cb43d73a0eaa320b9b1e401d009ee8b17efe0d66edfc56b8cfc0549efc846f3c SHA512 d307f3f52b3041953c5c5f42ff35710ad9089769100525f49acc7c4e51951c7468f67b0a621b0968a3cf5b3572ec4d683545fad5aaf5338003a84156d1b590ff
-EBUILD notmuch-0.34.1.ebuild 7236 BLAKE2B e5ce38995edef03ba47768537c19ec29ea8346957c467bf1868d737d97379c7ca3195767ee9d206efcfbc64b8457ba8560c3358a5d7b0529315780603a9349d9 SHA512 09a88a14e6a4347ea85a7bf3c7e5a29dfecf5493a9f8cfe30f9b6bb55c100d8d2edf74ccb450d3bb4078812d285e49fd37625e3d3ae7afc3dacaa412dcef8935
+DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c
+EBUILD notmuch-0.32.2-r1.ebuild 6727 BLAKE2B be60546e92e1ccfef8fcdc2b00a5f985244ca6a424d3382814b47a33197c82b4b32b7b8c5ada81c65d3addad2e2ea9361429c91355925243fd603a6a7921b948 SHA512 93f4e387aa03555296de37677efc8006298b43bb9fe6ff016fe85aa0d266a53be805558d1ebd4a91a1d66c9cff22d9d27d0529f511776c86823748181cdf1aeb
+EBUILD notmuch-0.34.2.ebuild 7236 BLAKE2B e5ce38995edef03ba47768537c19ec29ea8346957c467bf1868d737d97379c7ca3195767ee9d206efcfbc64b8457ba8560c3358a5d7b0529315780603a9349d9 SHA512 09a88a14e6a4347ea85a7bf3c7e5a29dfecf5493a9f8cfe30f9b6bb55c100d8d2edf74ccb450d3bb4078812d285e49fd37625e3d3ae7afc3dacaa412dcef8935
 MISC metadata.xml 1303 BLAKE2B 0efb03056bdd6b69e5a34feda715557fa94ae797ece1ac650d7ed3719a439069c9fcaf8308fb893048021dbf9b0691ea01096f7219fa5b9367cbb16c261c3372 SHA512 9eb0041d9336fb9778532e4947f37af4ec4272c5fbd24dd0cf26c8779e2e609a7198f107b2538b2e6c2b20cf29e2c648a59275725c00cad8ef550ab9bcab355b
diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
index ba302f77adb9..d99d63cef1d2 100644
--- a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
diff --git a/net-mail/notmuch/notmuch-0.34.1.ebuild b/net-mail/notmuch/notmuch-0.34.2.ebuild
index d7b1744e55c7..d7b1744e55c7 100644
--- a/net-mail/notmuch/notmuch-0.34.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.34.2.ebuild
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index f17c94052b0e..ac9ef6dd4bc9 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -2,5 +2,5 @@ AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b86904
 DIST poppassd-ceti-1.8.7.tar.xz 71400 BLAKE2B ca26f7298a8f679c595a9cd66622f1e8ddeff80a7b1655df91a7a15668337112113806d0aef788a374c483cbc957e765b178428d839da2c853ebf87e16039548 SHA512 d50549a4f6bdd9eac7fa74a7787e47dbffff14da883d4e8e23e24802883761c1a392b8a7fbffe5fa726845f48b3b33e0dbc1743ad2d689a4d396c91d0a42f8f1
 DIST poppassd-ceti-1.8.9.tar.gz 15465 BLAKE2B 22f6b521d83c4b7c4a8842cde22710c17dda26f9cbfb39d020de05b14c045a1606fcebf51557c2e38c932e009554c5f0d1f770d5cfbf1666f81eb03a342c25f4 SHA512 cc8953aaed8cd6d2633d1c2040e364770598eb71d563a29fd3f4798730654d002ba720babab0596cc336ea8aff403064e17e8b17c3df657e5c840db2230a2077
 EBUILD poppassd_ceti-1.8.7.ebuild 1678 BLAKE2B bb77369d9c5ed2ec923a00c5813a16d6c55f92e429d16011d20398ee95f6999137ad3e9f4b43f72d927ec85faf3dcb58cef203e9d4cc4f5f63bc1ba6b4ca788a SHA512 93fc50a9205e0a543e2d9d729b6450a3b736079a83061fd912e491c2d5dd1149658ec2d8d4349ccea6f183f40837b143a724649d8e2a861695126895dc96c521
-EBUILD poppassd_ceti-1.8.9.ebuild 1869 BLAKE2B 9e3ef48fac5cd0bac294714476f3b6d404e6a38bad26adf5662a0415eada52e0d2c8674077683697045021a81c4d7128133e559cb815111e8d1d11cbcd733e65 SHA512 ca02d9289a12cdeab650147fdbafdaccaa814489bc488a909230b67a5ea44a60b02fd5389e072d29ea0b95230a2038746271c02bb318e87a7c7b1368dbf88f59
+EBUILD poppassd_ceti-1.8.9.ebuild 1867 BLAKE2B c63efac501b2d46ea7904c3c155c019393539b6776f2829335de7ba6bfaf6ce73dc73728724f2af9dac50a33a6dcd5e9ab35cba2f64c3cf28af3ad57064b3430 SHA512 1dd364f1978f08e4a559c756c21441ffdec30c87be8d4bc74583d1c27bf961ce7f13e4b84a2501115d024452c496797767bd117f8b0037f19f7a7076e4b6a107
 MISC metadata.xml 945 BLAKE2B 908fc2f18052b0da8ef0e74d40d5886b9d66e6ff8907987a7533337507f36b835fb76580f9fca641bc50cb297629cf4a64553a7f9393e3dc7b4fdbdd9f35adef SHA512 40388f7a33c9879d5666920b38e665ed5a329dca4f7d042aceb8faf9b2ff43cf3b4e6d414f7233c6ca4ecc237cde2e98065325ea11ba55cd7187bacae2233a5d
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
index b83c13df4644..be579701be42 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/kravietz/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # Tests seem to hang.