13 files changed, 422 insertions, 10 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 8cc6af89275e..958ddca28446 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index e633e7f710fb..83b20df2af1b 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -2,6 +2,9 @@ AUX alpine-2.22-cc.patch 537 BLAKE2B 0f916be9bf91d8f9c347c9325d20a13e8ffdc462f05
 AUX alpine-2.22-fno-common.patch 677 BLAKE2B c03b54ff8db4e8a4868144c3b6214e75153bf88af78380bc5334a94cac4c2aaf9404a3b6ba9cfb4ac662af2f911211703c5383c37138dfe0acc71c965e08c395 SHA512 cb1513c374ced36adfec51267a61cdb38c38ea0d3d81812a1eebdaf973f2aaabf74f8fde58920c4044d0f389898966335cae2f54505a8314e0f917fbe2786cab
 DIST alpine-2.22-chappa.patch.gz 173232 BLAKE2B ac2cfc22119c9e60fdc053212447fb5df8cc59781c049329560d21e19e67d700fe45a07649352747583b500a605499eeb61dfd83ba150c3bd58f4033486e2581 SHA512 9db36ebb4fb2efaee975ed33d44cf95780c56075cbc0ad39056268248db38109e1bb04e279b40cdd085b3dfec89d0f9c69aa4ddf5a64b5708437909661288e23
 DIST alpine-2.22.tar.xz 6336604 BLAKE2B 65cab2000b6c606c002efcca6e731d2c87329b4685dec81d202e95598b4302175137ea84f079af1f766a6ef99d0b2cb51132e12539bea7f4d24954bb48af7bea SHA512 7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1
+DIST alpine-2.23-chappa.patch.gz 172604 BLAKE2B f814a269fe316dd42e73f98b09a67b26f8d0c5db9bc83ebcc6145f7f3373f14a5fa9f7991f60a4186c0f078428fa0a38bc81b0459998045ea433438f730f05a8 SHA512 5195db336651da161b3d94afeab8f46fd6bd3d1953db72b8f453355b46eafe8afe26eccb2466024f077fc3e40ff52e1a14a126ce3cc33fdcfcaeded67f9422d0
+DIST alpine-2.23.tar.xz 6330784 BLAKE2B e7be73dc0ccf04cfbd8712e70f8b114063983b971c1d967765b41ab0bf86369815d954e85fc4d9622539b1e3a6324ffda635a2808b9439a123302e7f9c9f421d SHA512 abc3675b18d6bd20a547b8e2c3f1f4c668aee2f2d20f426f28b4b3d4cfd66762777007441da3b0fda74e625c71bc2ef05434089508c2af804e62cf216df5554b
 EBUILD alpine-2.22-r1.ebuild 2309 BLAKE2B d294369cddf068bd2e7a01de85f2abeef467ff88db001fb6e1994975f422c16cf37fe07d659d156d9b7185035f9a131f58c85bae3e2b46a2dcdf02f0d5703654 SHA512 21d917188d5b94d01ca12bcabd65d41bd44e3b721a1081b1fadc69ff082d9f7fd32b8bf236b3074b824df22c39e2ec0b236d38c77173376f8871a2e2e5e323b2
 EBUILD alpine-2.22.ebuild 2060 BLAKE2B 5f58202d66033d9417c2d9eec597e2cef12c04c7d7953490fd680782d2a843afdea6791bbe2a2cb265ccff3934c55221f5495b7c656289874b64f6fd83fb78ce SHA512 6685cbdb825260de2da09d8a23c06be390235346aa93d411cdabe9741dff45c10399b4693baa3bd30355591de59b7dfc77e5e847924d5f24ae226645569d5301
+EBUILD alpine-2.23.ebuild 2230 BLAKE2B 8494d490310ab76d9d9caea5da895d2b94a66a0c715db3787407a13cfeceffa3f7bb880a4aef40614def220869738156f2e5ff828b0c7e78e8b2a188c0fd54ab SHA512 26cb1157828ed5f086cf293a89a7d34f78280e80cda9322c2a7d822c5326020a51a32249d18540f870982c2f275f4c00f4db6de81f829aef844960392ef77308
 MISC metadata.xml 731 BLAKE2B 299d44541ef09d51036feeb36ca1d720fba218c526cbb34d7d7358f8baa8d227ee96f823a1960a3fe16313da57f3ea2cd83424d5228839d722a94f780680949e SHA512 fb53b04da391da15373da8dff24b64abd9bee04a24eea999f1331d175c2084d9267c056426b5a9d7cebec808002715782bc1d414a70c310ddbbad72c0540dbae
diff --git a/mail-client/alpine/alpine-2.23.ebuild b/mail-client/alpine/alpine-2.23.ebuild
new file mode 100644
index 000000000000..a3563213e20a
--- /dev/null
+++ b/mail-client/alpine/alpine-2.23.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
+CHAPPA_PATCH_NAME="${P}-chappa.patch"
+SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
+	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
+
+DEPEND=">=sys-libs/ncurses-5.1:0=
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	spell? ( app-text/aspell )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+src_prepare() {
+	default
+	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
+	eautoreconf
+	tc-export CC RANLIB AR
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+}
+
+src_configure() {
+	myconf=(
+		--without-tcl
+		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
+		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
+		$(use_with ldap)
+		$(use_with ssl)
+		$(use_with passfile passfile .pinepwd)
+		$(use_with kerberos krb5)
+		$(use_with threads pthread)
+		$(use_with spell interactive-spellcheck /usr/bin/aspell)
+		$(use_enable nls)
+		$(use_with ipv6)
+		$(use_with smime)
+	)
+
+	if use ssl; then
+		myconf+=(
+			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+		)
+	fi
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1 AR=$(tc-getAR)
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/man1/alpine.1
+	else
+		emake -j1 DESTDIR="${D}" install
+		doman doc/man1/*.1
+	fi
+
+	dodoc NOTICE README*
+
+	if use doc ; then
+		dodoc doc/brochure.txt
+
+		dodoc -r doc/tech-notes/
+		newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
+		newdoc "${S}/doc/mime.types" mime.types.sample
+		docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
+	fi
+}
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index dd59909e3ab6..78184cfd1865 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,8 @@
 AUX 3.34.4-CVE-2020-11879.patch 4256 BLAKE2B efe57b53f04908ed5ff83da42a759428b68cef0ceeeee158cdc9792e4af9f31654621742db3ae5a15f30ba68409cfbe775d09d7893cc9dbac0328b5c092f3695 SHA512 7484974c557eb084055b80f45f03d0d7f40084bdaf53cd90dd1f62efea250801eb99f6a35befd9e19c3c44e0b2d1ddc0db299d3063ca2045b7421bfcbba27c76
 DIST evolution-3.34.4.tar.xz 11964640 BLAKE2B 48b58208064633236be32f44ff49f8718e110d1ab1aa311b3652affb3b5793b9f6775519191a9480efef731c9f14ff269d65dacbd8d411b30be64daaf953c4b5 SHA512 54ff4b191237b291e3e008ca8691624ac0af35bae096c20615ac5a51be033c97ea28be6629362a3676bee9285afab666c4624cfcca536bf5255ecd38dcf3ac58
 DIST evolution-3.36.2.tar.xz 12027568 BLAKE2B 3bf2eca4a26e16b34567b4a976ccaa0d3138e3a7ba1a0c9652c3e642dd7e332e4a9994b9e5ae6ce3ed137eb85ac396c83b3bb84fdd99129fe4537a391ad268ff SHA512 2dccf69d32c4381f40ccdf84b621b8241c22bdb992cb77a87ce2e62e3598c436e7d0f8b72ce4fe504399c04a38266b0b0c2abf04000267a16c242d2dec7b9e9c
+DIST evolution-3.36.3.tar.xz 12042584 BLAKE2B 164a901332db7e95461f45111bb3799c1b56fa3826c78059d4d8b12979e985d47983f5af0a529b5f772196d9a2134cc11f082419cfb67797f1a4ae76f4756165 SHA512 867482e4532ddddb63dbe382df0daa1058e1509172c1c80aa9f3b73574509f1def9ab0694f66ceaf9590bde761087ad7d0bcd62ddef3e477697614eb36ac530d
 EBUILD evolution-3.34.4-r1.ebuild 4430 BLAKE2B 038126aa987508944b795cc8ac73f48f24c0006cba40d9522058ed621422a7ce1f1587067e86493aade42351400023e16070abe1028e10e9aa112aac8871b3f6 SHA512 d027de5fef0f850d815c6e09b6ace58675dae79af7cf2fcd6da23f460feef7df305d8ecbe1acf8f8e55a54cb9ca5d1ec3131ad9c49dcbea440625abc449a2ba8
 EBUILD evolution-3.36.2.ebuild 4383 BLAKE2B 4f80579ac95b19852ef29127cd7d44eb7b3030aee511d426637731e8014abbe6c22f45a7904d458d1e3d4b0e2c55924466541dd41e8fca0e0ec399ae11809bdd SHA512 db923a977faa5a6c2141a5fb96468a9b39c7a5664d47af6623c34bfea65c28a7da0163c2d8617f43445d7d10b8a1ec64b0362ec57478b7667a7841b1eecca607
+EBUILD evolution-3.36.3.ebuild 4383 BLAKE2B 4f80579ac95b19852ef29127cd7d44eb7b3030aee511d426637731e8014abbe6c22f45a7904d458d1e3d4b0e2c55924466541dd41e8fca0e0ec399ae11809bdd SHA512 db923a977faa5a6c2141a5fb96468a9b39c7a5664d47af6623c34bfea65c28a7da0163c2d8617f43445d7d10b8a1ec64b0362ec57478b7667a7841b1eecca607
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.36.3.ebuild b/mail-client/evolution/evolution-3.36.3.ebuild
new file mode 100644
index 000000000000..2c90448a8995
--- /dev/null
+++ b/mail-client/evolution/evolution-3.36.3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=webkit-gtk-2.26.4-r1 and >=gspell-1.8 to ensure all use enchant:2
+# TODO: Adjust webkit-gtk dep to actually be that once it's keyworded for needed arches
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-libs/glib-2.46:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.24.0:4
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	highlight? ( app-text/highlight )
+	!gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 399d3b9e6627..e3837d8d2411 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,13 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
+AUX mutt-1.14.4-no-imap-preauth-with-tunnel.patch 1001 BLAKE2B 20d5210ca085d26270be5588fa8058068715e91461832bbf09e21213cc6e84d7b118437a7e11a1e1202af7c3b76edc0f33d5fef2e3b61cd47cd2ddc03a578723 SHA512 07c243290f266b1446f83448796c1871234f38f05f0586cd1360bc6d80088a693451d7f85123da04004489d12d99191196c9bbf5291e90875955f05eb87fff02
 DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
-DIST mutt-1.14.0.tar.gz 5220515 BLAKE2B 4a9b70f0d32df1a33947898b71044a97b9cbca04ba0c01f06cae967cb9dff6fa06dd005c7f0e0642654a4cef04686eb38af7c032aa361f0e3f2f57faf66d93d4 SHA512 66eddad7a9ce0c067795b8f0285159a6aa7fbf9304ef287888f1c86a942d565e1f71294549e22960a4db8bcc06b1e9f6690c3e04dedf8b37d304b4aa6a250225
-DIST mutt-1.14.2.tar.gz 5222938 BLAKE2B e59dd4e1e61380a3c49fce8d722e7a263e81713208660e28629f428bc13724ccc80cffb3345ec1b8dd0a8aefa32ccdea94b8098b826268ce0fe64f6a11bdfec5 SHA512 b18b0bc52341d31a60558ca9b11545f5352e89bf7c215b10061efcd382af287416299f7efa017e3a03937a11fd630330ff8389dbe80fae2e6437297687653cb8
+DIST mutt-1.14.3.tar.gz 5003987 BLAKE2B 43e9be05e3da6f3c257bc405fdf45b87114efdeece169d2919390b5cf35a935d1c2798b0ab7eb213eb25eed3008e452fc4c9f02ca8fdb209dce8d9655fe7fb84 SHA512 d7ac53cd383e7491666aeb0b33703dee47cfb9a8671484b713f3b5051227ca2fa618320df0267b7d4eb43a22f9fc9d20d457ddb3f98f907ce49fe7f2915a865e
+DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
 DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
-DIST mutt-gentoo-1.14.0-patches-r0.tar.xz 31124 BLAKE2B e5703fb22d627cac2fd7ef9565c10a46ccd3153611335aa3051b1d38feb68b52fb0bd0a1360c02fa0723bedbdaa2b4000020546f3f5bf039b5e9578c6481cf6f SHA512 1c89d6843392ad9db869dce9c90a04cb712bf3c783797f231749fddee6047e5ec79513abca644e76e3f28c4af2e94f055ab72a794f4ba6a971d2f668c6b6a1ff
-DIST mutt-gentoo-1.14.2-patches-r0.tar.xz 31076 BLAKE2B 31bb4efd03f45b4b79ed325471166e91f0e419318f3cf1e5426a627e2557bf19fbe03ae2c19cc97719c574b6a8df19b96955429651bffb41d5220888553b86a9 SHA512 5a0ddf0242caed5bed19700904b0fd91883542b9b12f0b16c1b4f7f39944d0737429991cca7cbf4f9932deada8b7fd71caff284775ddfcf3ec283554d3e727a9
+DIST mutt-gentoo-1.14.3-patches-r0.tar.xz 31148 BLAKE2B 49f5f7b446d635de31e5280bad09422bcf27543b58e2eade6ddec35524e9c49083fe59224e6103d6992f53571d77c606c6280e58d05606900ed01ccbd4c4d697 SHA512 444f6456b3c1eb423cd990c3f5a7f4f6ce7f0706f461ca507846ce6ee855e32331720bc7c0fa2cb834d5433d9e7a0d7d2d90c5b8c0ac917dbd3c63a622ae6ce5
+DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
 EBUILD mutt-1.13.5.ebuild 8370 BLAKE2B 73455bc38f547ad43a1fcd3eeca0f7bb3841fd9c03d1e76a4e9d7871d62a0f7867b4a27f78d209dcca177dd0b20dc5c404939f74153ef0efb6b0560564cc6aef SHA512 a5e12b65007bb43fcf329617a512fb6bb268bdf365df322c7869bc075c03df8ee67e206160a488d73bd0b8d5b4e50f23c4d7409cf0e84ac3ac53d5bd339a10a3
-EBUILD mutt-1.14.0-r1.ebuild 8238 BLAKE2B df3056665c7828775ca8ff1cb9999a6aeb48a6218df128e07798a7c01c2672f5806f26b3c9869adb20af3d9ff4d48da422a59a118fba5b00a268588315abf03a SHA512 e7113be3b0f73c143b439fd6214734cd35af06a09bf6ed37596db9bc2b73913b7272b9b05c68364cd3e8dc00ac67d5ccb009dc7dd8793e251b81e580c39cf62e
-EBUILD mutt-1.14.2.ebuild 8238 BLAKE2B df3056665c7828775ca8ff1cb9999a6aeb48a6218df128e07798a7c01c2672f5806f26b3c9869adb20af3d9ff4d48da422a59a118fba5b00a268588315abf03a SHA512 e7113be3b0f73c143b439fd6214734cd35af06a09bf6ed37596db9bc2b73913b7272b9b05c68364cd3e8dc00ac67d5ccb009dc7dd8793e251b81e580c39cf62e
+EBUILD mutt-1.14.3.ebuild 8236 BLAKE2B 1a7f0c1b474f07992db19acd9ca1f4373435aa44cf06cd6f8b12066744f2bc559d11d83197b01d96634aba6b2d0e6495766adf0352c07a52334093ae6b13adfa SHA512 03e84726da1c032f536d81e55e111f899ed4b41bfb1462475fb4dfa7e642b0f8a03f6001ecd8ef647c97a1bb0ec849331a0781b0696726812d31aae8a791a114
+EBUILD mutt-1.14.4-r1.ebuild 8348 BLAKE2B 07dd0155ea61216acee9a8ded3a9e21bbe5c98f1a7c3ccad526823ba6c5bf90a5d926fc2c03dc903bac1ab20f690be858c0274bae41c38fb9a25cdf8ba5dcb30 SHA512 2e5e4b9842f1142de9c3f9b109a5ade95ca35bc7a62de867d690934702b9acbe292dff32d266c057e1337d19942657f8bdc0071a7e9e0a9f6c0b805c9ebd2aac
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch b/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch
new file mode 100644
index 000000000000..d4d2104db08c
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch
@@ -0,0 +1,30 @@
+From dc909119b3433a84290f0095c0f43a23b98b3748 Mon Sep 17 00:00:00 2001
+From: Kevin McCarthy <kevin@8t8.us>
+Date: Sat, 20 Jun 2020 06:35:35 -0700
+Subject: [PATCH] Don't check IMAP PREAUTH encryption if $tunnel is in use.
+
+$tunnel is used to create an external encrypted connection.  The
+default of $ssl_starttls is yes, meaning those kinds of connections
+will be broken by the CVE-2020-14093 fix.
+---
+ imap/imap.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imap.c b/imap/imap.c
+index 3ca10df4..78d75b07 100644
+--- a/imap/imap.c
++++ b/imap/imap.c
+@@ -532,8 +532,8 @@ int imap_open_connection (IMAP_DATA* idata)
+   {
+ #if defined(USE_SSL)
+     /* An unencrypted PREAUTH response is most likely a MITM attack.
+-     * Require a confirmation. */
+-    if (!idata->conn->ssf)
++     * Require a confirmation unless using $tunnel. */
++    if (!idata->conn->ssf && !Tunnel)
+     {
+       if (option(OPTSSLFORCETLS) ||
+           (query_quadoption (OPT_SSLSTARTTLS,
+-- 
+GitLab
+
diff --git a/mail-client/mutt/mutt-1.14.0-r1.ebuild b/mail-client/mutt/mutt-1.14.3.ebuild
index 655ecdfe2af2..1080859254bb 100644
--- a/mail-client/mutt/mutt-1.14.0-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-1.14.2.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 655ecdfe2af2..2a138c892046 100644
--- a/mail-client/mutt/mutt-1.14.2.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
@@ -74,6 +74,9 @@ RDEPEND="${CDEPEND}
 src_prepare() {
 	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
 
+	# really unfortunate security fix of the day ...
+	eapply "${FILESDIR}"/${P}-no-imap-preauth-with-tunnel.patch
+
 	if use !vanilla ; then
 		# apply patches
 		export EPATCH_FORCE="yes"
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 5420f922a408..fc5e33b581a2 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -4,11 +4,13 @@ DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb006
 DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
 DIST neomutt-20200424.tar.gz 3323821 BLAKE2B a062e1fbf14890824b2545d10c9ca9725e0c170f8e2614fe2742a4d1c2a46c1d36495d34a8cd502520fd5e7f5f6f7c39dfea812784768a934cb4e718659a9142 SHA512 83569b304faf851a2efff332d237b0a35dc11b204740dbf828bfa662e157850b975536f25fd2a25057f16c128e9c9f0ca883df9c1d26e45c0608b424ec8d2ef9
 DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670
+DIST neomutt-20200619.tar.gz 3347610 BLAKE2B bf8559b8847306c602759c857db3372aba714bf6762144d32af2c1e73703dab3a74c023d10f9389802c554ea7a7ca0591cbcfdff1d8ff685a791867e1125e275 SHA512 75d8f878776c57551f7b5fbbaaeb6bb671afe79f7f02a2e44deae40d4bb8a2db4520ae1b18f8e137ad574f401b591fdee5a1e8b2d78cfb71fa428c49418360f4
 EBUILD neomutt-20180716.ebuild 3278 BLAKE2B 02747c8e7443aa7a57c4a9d24f71698f897a1f720cd95e3386544e0b9cbb96e3527f4d4cc96a9a23bcb6e74cfc9a7b04123ed5c9e0888a85231dc3ce633cd18c SHA512 4f8d617c55d0af52170ca62b97c1910c5d536e6284d4457fdfddc403b830d8bd980715e63b4af1fa35a00a8e120813c8b989562ef8d5047d8ea28325d40a5f7c
 EBUILD neomutt-20200313.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
 EBUILD neomutt-20200320.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
 EBUILD neomutt-20200417.ebuild 3298 BLAKE2B c7c891eb021e388ed1979eae71ab5b59f9d8c6b907a892653edb991ee9e23bd977d85f5ffabd550cb409a33bb68b1d2eb92e5324957a2bcd82406f38bff128f7 SHA512 de81dac1604d64817568d45c75123262d17bfc042cc640201e5ff4845d0c5694f928e051ad4cf7cd2eda9a95dafcbe06d2d1a16361ee2f67379a5efb92f885e1
 EBUILD neomutt-20200424.ebuild 3298 BLAKE2B c7c891eb021e388ed1979eae71ab5b59f9d8c6b907a892653edb991ee9e23bd977d85f5ffabd550cb409a33bb68b1d2eb92e5324957a2bcd82406f38bff128f7 SHA512 de81dac1604d64817568d45c75123262d17bfc042cc640201e5ff4845d0c5694f928e051ad4cf7cd2eda9a95dafcbe06d2d1a16361ee2f67379a5efb92f885e1
 EBUILD neomutt-20200501.ebuild 3298 BLAKE2B c7c891eb021e388ed1979eae71ab5b59f9d8c6b907a892653edb991ee9e23bd977d85f5ffabd550cb409a33bb68b1d2eb92e5324957a2bcd82406f38bff128f7 SHA512 de81dac1604d64817568d45c75123262d17bfc042cc640201e5ff4845d0c5694f928e051ad4cf7cd2eda9a95dafcbe06d2d1a16361ee2f67379a5efb92f885e1
+EBUILD neomutt-20200619.ebuild 3298 BLAKE2B c7c891eb021e388ed1979eae71ab5b59f9d8c6b907a892653edb991ee9e23bd977d85f5ffabd550cb409a33bb68b1d2eb92e5324957a2bcd82406f38bff128f7 SHA512 de81dac1604d64817568d45c75123262d17bfc042cc640201e5ff4845d0c5694f928e051ad4cf7cd2eda9a95dafcbe06d2d1a16361ee2f67379a5efb92f885e1
 EBUILD neomutt-99999999.ebuild 3315 BLAKE2B bdf80e05854de6e592eda4e51eb9874d90a5d0d8e33ceff4480d0335822ddbfd5e850bf9ab2050932b2cb4b2a29d326d564f6f507fd5e6a8b021f6049b87bdd5 SHA512 530d4387fe1d89cf6681b9040548d9213afbc44a89e1e0bb97da21a3702f89df11bd5f2c4e2b6321a99f34210df48e2874a6dda1c29e43f6110f46bf0c6b528d
 MISC metadata.xml 1402 BLAKE2B 03ec31bb9fed5d920a22ed5bf855130e7bd538f8eac24aecdcc5cdfd4980a3328f150dd6e957acec286c96f86fca6a8d69a933e496c7fe7c9fc4d0ce5653bcc9 SHA512 cf8dd5e2317a64c7f8c69c2e39436099917e0f6edc0cb6708d9c6c2f46d50c5d897a09d08a4afff81dc3d3beb3886be45c92d7882f2b1a6de3c947f0cd0314a0
diff --git a/mail-client/neomutt/neomutt-20200619.ebuild b/mail-client/neomutt/neomutt-20200619.ebuild
new file mode 100644
index 000000000000..169bb2a3aa6b
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200619.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet"
+
+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-0.9.0 )
+	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? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+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 )
+"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(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)"
+
+		"$(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)"
+	)
+
+	econf CCACHE=none "${myconf[@]}"
+}
+
+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
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index c635338f5236..baa89da40197 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -19,6 +19,6 @@ EBUILD roundcube-1.4.0.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab4
 EBUILD roundcube-1.4.1.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab476c3082bdd1fb0a92487b1351da1dc5c5bc57fab45819255d5adcf6dbb400f6c2ed285abd27b34a7acac77d1928 SHA512 eeba5df2817a2b30f98ebcb05f86fbe7a68b937743fb61c66928a1f32156c63390832e23bcdeeaafa6859c461ef923a30238ab6e71ef1a0c8858c0c3f5fea2da
 EBUILD roundcube-1.4.2.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b
 EBUILD roundcube-1.4.3.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b
-EBUILD roundcube-1.4.4.ebuild 1797 BLAKE2B 0506d749972dada6088b70f23450056541d989e6e513ddcac0a39ed52ef8f285f69db2df22c0063351754a52863e566eb71ba7a2973453ba377d348b929e54fa SHA512 b19ad11107e81a716a13de684cb02b7cc0623569fb9d6003b3c60b51afb64ebf45bc73c2f5030645fdde093bdda8342d33818ac9db8db4023f246bbe8cc9e4b2
+EBUILD roundcube-1.4.4.ebuild 1796 BLAKE2B aa9808e5061166b47aa514da428bc3476d03c33432eaf9cf84d1d4ee6ead49510035d124117652648ae66982fe348aea4f36fe9d0a3d049cd83816d61351d99c SHA512 812068fa0c25ef2bbb87f0c6e0eedb3511403899fa1941965fbdebbaa3b61e7cd4fb5e6b8eadfe9b15eee5753eaadc7538fa9b622f55746c7a1eb5fc509732d4
 EBUILD roundcube-1.4.6.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b
 MISC metadata.xml 955 BLAKE2B ca9dd109384433cdaca59b820aae795a4555459cf36f057b17949d601bd5ece8222dbb59502872ac6a16387e55839f859b91a6c6718523aaf66e4b677d25d33e SHA512 ff1b796f79f002814b038763305a404ee2b65d49346a10b423dc8df982ccd4116548c8159bbcd551ccdcdb5824ef6b0774abf6a6bdc851beb896f6e5ed97bf1a
diff --git a/mail-client/roundcube/roundcube-1.4.4.ebuild b/mail-client/roundcube/roundcube-1.4.4.ebuild
index d55f6f4eebdf..30a88f3a87b2 100644
--- a/mail-client/roundcube/roundcube-1.4.4.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-co
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86"
 
 IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"