gentoo resync : 12.05.2022

10 files changed, 189 insertions, 16 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 9641f5ceb2de..de6af1154e91 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -5,13 +5,15 @@ DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c
 DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
 DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
+DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
-EBUILD neomutt-20210205-r1.ebuild 4406 BLAKE2B 68a7f699d04b267126d618c9c13452c0bb853f3bc68e3e8122ef4f98be937b3cf44140f57edc5e78e9f02dfaccd4797972296f1a80692ba073c31769f448d592 SHA512 5147ca2af026160e6041b03d279547070558512781e138f6bca463ebc95576d19722a368bde2f1a685199dc85458ccbbe81ed5f07ca888923dd92432cb5412ba
-EBUILD neomutt-20211015.ebuild 4324 BLAKE2B add5b421667bbc5f1597f858ba97d5c24c96fbf52cf41d01108ade7c80fb5b9cc0b0ee96860fc6fd06ab7490a5056cefcdefe5038f07200ee7fb17575e2ebb47 SHA512 a38f6b6ce2f2ea350286f6ce2a0755171033b9304172ceb4bdf16913b1ef440f828de8f683383fa930b81b559420906a8e709fec1b232c5404a6afd893e3eca7
-EBUILD neomutt-20211022.ebuild 4324 BLAKE2B add5b421667bbc5f1597f858ba97d5c24c96fbf52cf41d01108ade7c80fb5b9cc0b0ee96860fc6fd06ab7490a5056cefcdefe5038f07200ee7fb17575e2ebb47 SHA512 a38f6b6ce2f2ea350286f6ce2a0755171033b9304172ceb4bdf16913b1ef440f828de8f683383fa930b81b559420906a8e709fec1b232c5404a6afd893e3eca7
-EBUILD neomutt-20211029-r1.ebuild 4441 BLAKE2B cbdbc72d4e04c6da56a8bad6cb86f870ccfca7e18d33b7bee1b0d39e1bb6ad9fef955f9599b605a38487534dc20271b6c1c2810bd61412b5cc850fa2cf0785af SHA512 13c19d8bb3d4765837de2fff92b976f9da457110d435936afeb8c9948210a3d6ce8a98e72cc5977a3fafb9c92cf09d3e04dde7ddd4075c50a6e643a5784b2675
-EBUILD neomutt-20211029.ebuild 4324 BLAKE2B add5b421667bbc5f1597f858ba97d5c24c96fbf52cf41d01108ade7c80fb5b9cc0b0ee96860fc6fd06ab7490a5056cefcdefe5038f07200ee7fb17575e2ebb47 SHA512 a38f6b6ce2f2ea350286f6ce2a0755171033b9304172ceb4bdf16913b1ef440f828de8f683383fa930b81b559420906a8e709fec1b232c5404a6afd893e3eca7
-EBUILD neomutt-20220408.ebuild 4443 BLAKE2B c6c2a7e6ce8a59baf72463460f1584b0015f91d7ad7b8189d724e9c0266ec3e2f51fc8aa017735e5b626848a7a13addda67010a8d731d18c80fcac8d1a11c887 SHA512 3161fc5ac48d554e7b892e87e8e1dc684eef8877432a130538024c3423f3c6e60a2d61b6b6caabc4bc14d62e0c2fe2524c39b07d8e74c206cc80a7d3c3040cb5
-EBUILD neomutt-20220415.ebuild 4443 BLAKE2B c6c2a7e6ce8a59baf72463460f1584b0015f91d7ad7b8189d724e9c0266ec3e2f51fc8aa017735e5b626848a7a13addda67010a8d731d18c80fcac8d1a11c887 SHA512 3161fc5ac48d554e7b892e87e8e1dc684eef8877432a130538024c3423f3c6e60a2d61b6b6caabc4bc14d62e0c2fe2524c39b07d8e74c206cc80a7d3c3040cb5
-EBUILD neomutt-99999999.ebuild 4443 BLAKE2B c6c2a7e6ce8a59baf72463460f1584b0015f91d7ad7b8189d724e9c0266ec3e2f51fc8aa017735e5b626848a7a13addda67010a8d731d18c80fcac8d1a11c887 SHA512 3161fc5ac48d554e7b892e87e8e1dc684eef8877432a130538024c3423f3c6e60a2d61b6b6caabc4bc14d62e0c2fe2524c39b07d8e74c206cc80a7d3c3040cb5
+EBUILD neomutt-20210205-r1.ebuild 4400 BLAKE2B 9d12fb97150d01584d94fc0ea8366e67787e346a5f0dee7240890a6e0b43d13af8f76abde6a0afb4a93d0ff8141ea2b8137cb17f1ec3c1e7b2f20c19431ca2ae SHA512 ca0a381cf7c544f94554ad0bae1c8e053c5c76a045ce86c9e46343626efbe699b483af7dd3f3182e5b8e3871802c5addf68693b6109722fea81ccfb8a85129d9
+EBUILD neomutt-20211015.ebuild 4318 BLAKE2B 076853dfda2e7447e08fc503db1b1613726f5a48f4cda625052cfb1068f45f900b2f2c9d6ab142b24fdb198f2bb72a2b474fb1b39ffcbfa0e03934ad725df4f7 SHA512 26d24dc2d5daebca9a40283fb1f902b5703586b35c6a98195bc186f7c488bd0c1b7169bd88856fccb52290f82931b97c5d015c3f2d7eeeb4fafb3c169fd49dab
+EBUILD neomutt-20211022.ebuild 4318 BLAKE2B 076853dfda2e7447e08fc503db1b1613726f5a48f4cda625052cfb1068f45f900b2f2c9d6ab142b24fdb198f2bb72a2b474fb1b39ffcbfa0e03934ad725df4f7 SHA512 26d24dc2d5daebca9a40283fb1f902b5703586b35c6a98195bc186f7c488bd0c1b7169bd88856fccb52290f82931b97c5d015c3f2d7eeeb4fafb3c169fd49dab
+EBUILD neomutt-20211029-r1.ebuild 4435 BLAKE2B 5ab23ff25ed3bc162e889d75471dcc59a2597d6105d2770d88443bb6d535d2ae984b285f2c23e194d7d4b8c77935c30c028fe147ebaac2c54e09521df2c98937 SHA512 75fd831dba3cf7dc8d9b99f503aceb3836ed88521c05ded9f068f56fe60aa6f6200edceaf1251136e6f23185153cb74ebe6940dc2d22ab2b1b0c9667964729e3
+EBUILD neomutt-20211029.ebuild 4318 BLAKE2B 076853dfda2e7447e08fc503db1b1613726f5a48f4cda625052cfb1068f45f900b2f2c9d6ab142b24fdb198f2bb72a2b474fb1b39ffcbfa0e03934ad725df4f7 SHA512 26d24dc2d5daebca9a40283fb1f902b5703586b35c6a98195bc186f7c488bd0c1b7169bd88856fccb52290f82931b97c5d015c3f2d7eeeb4fafb3c169fd49dab
+EBUILD neomutt-20220408.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7
+EBUILD neomutt-20220415.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7
+EBUILD neomutt-20220429.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7
+EBUILD neomutt-99999999.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7
 MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184
diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
index f0ec73388d4d..5db3c1afba0c 100644
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 ~s390 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-client/neomutt/neomutt-20211015.ebuild b/mail-client/neomutt/neomutt-20211015.ebuild
index 85f32fdfd081..6c5d607b8a48 100644
--- a/mail-client/neomutt/neomutt-20211015.ebuild
+++ b/mail-client/neomutt/neomutt-20211015.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-client/neomutt/neomutt-20211022.ebuild b/mail-client/neomutt/neomutt-20211022.ebuild
index 85f32fdfd081..6c5d607b8a48 100644
--- a/mail-client/neomutt/neomutt-20211022.ebuild
+++ b/mail-client/neomutt/neomutt-20211022.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
index dbe164997e6e..b8a28e2720eb 100644
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 ~s390 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild
index 85f32fdfd081..6c5d607b8a48 100644
--- a/mail-client/neomutt/neomutt-20211029.ebuild
+++ b/mail-client/neomutt/neomutt-20211029.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-client/neomutt/neomutt-20220408.ebuild b/mail-client/neomutt/neomutt-20220408.ebuild
index ec67e6bc7849..b3f780bca0ac 100644
--- a/mail-client/neomutt/neomutt-20220408.ebuild
+++ b/mail-client/neomutt/neomutt-20220408.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
index ec67e6bc7849..b3f780bca0ac 100644
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild
new file mode 100644
index 000000000000..b3f780bca0ac
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20220429.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl:=
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
+}
+
+src_test() {
+	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
+	# already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > docs/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index ec67e6bc7849..b3f780bca0ac 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75