gentoo resync : 20.10.2021

10 files changed, 511 insertions, 1 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 45ff4bfa14be..9d114faab140 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index ee82189ed1bd..4765beea1152 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,4 +1,8 @@
 DIST alpine-2.24-chappa.patch.gz 172010 BLAKE2B 39f5336ead355a4b78bcdd5b44dc398888bf93f3c3efa95b3ad8a86f3a0dda13f03164a03fbed898150864130648a204a6b5d9e32c3437138878516d014c8bbe SHA512 7152a8e4a79a530345448267204a96bc2585b4fccb23f011fd4dc97bc713696b8eb7ca9563655d8da33570ef14bf29577f82fe0f104c80590a43b0e74ec89e81
 DIST alpine-2.24.tar.xz 7341676 BLAKE2B 63e2d9387f1a369f9a4623625524f25eec64c600672092608256fd2827c094fae1384b35da84ec5f5865295744982ede533551dc47b6f0c80f2405ed16cad546 SHA512 642a51f73732ebdf7c40e2b66370aa2f48fb13b349b477871b26295c3e8b860a0cc78dec9f80efc6ea74c548a080ceff04181eb18c35a9c8cae8d8ef831178c5
+DIST alpine-2.25-chappa.patch.gz 172963 BLAKE2B 5e306325beb46fd2f716620794894f563b93e116693a1af050ea5f61c203350d2aa72b67d7f66acc748caea6a73bdef85f45324eb01edf8a6035b07f8a50e2bb SHA512 b88ca58e42a72b2b92cf28e4cae492a5ee75d534821046645fcc358833e87287fc707d5bec5c3508942a0ef1ecffe64916f00f1a01e430048384838e5ca40358
+DIST alpine-2.25-ssl.patch 5431 BLAKE2B 0cf2fcb682fbee41aa988ff089c16b75ebd9bee321c1c130d0b5136e5ca521bded7e9a97cd3ade1c86b17e72136264d4405cc36427a347c9bee84ee8a64548d4 SHA512 698d2a3c3b7b588fe3fcfe0291f0aab05c42b5ea80de1f210c1985082651329b80447de4e8057bc7e962fe8ed5175ea8132bad413c02fb1f0cc67c84e9420642
+DIST alpine-2.25.tar.xz 7495372 BLAKE2B ce2587a309c87ba527d51c360ee0d9627453cce6585631f569eb26db04aa6c5cddb7c9599478092447a040c43e9234e78a942fef4b1186d07c608163f96236be SHA512 76c214cf66f4ac7af3de40357ad3a592ff2a119e327e5f6c256125b7865d46b09197435fe6ac8077ab7a498e4821925939f3f902431ca77baa786e149466a193
 EBUILD alpine-2.24-r1.ebuild 2176 BLAKE2B 6fca43a26daa89d8b7d57990c09c2ca50fe49eac66c50fb095abfe26beaeefa6d3d14946c5e622cb4e4a173cf3a3830fb8a2bdff0fd70982a1d6f848734ba128 SHA512 9c0bffd2db7029e4516219bc6d8a0fb07be074e5b21a6cd3da5192845fa76b4dd0273bcba9622d2472b8d92cf0d654a47251215cfdd86542474239712ca8c999
+EBUILD alpine-2.25.ebuild 2411 BLAKE2B ef36452e59caeae479cdbc64c69102f3d316e5c47633586544cfa00edf755d4ff72600d1fce614f490bd2aa80d7978221715b86ff55b5a5bf22e493508d614b4 SHA512 d0baebb5678516ea6546fc79f92d096f14c7520da0cc57259cfa4c49bbbd53842f970f7631d58db826c26ebd87a8fcf0d46a4180b9acd10f7fc1cbf5547899c7
 MISC metadata.xml 762 BLAKE2B 026faecac5042e19cce6f125f66fd7af22cbd50140abe315a686d1b129f53b939f5325f9bd1956d41b47da146b6f37c597fe91370722f2f4c7af8169cbcb0f66 SHA512 e11cb2d6c0612fc09302485c38d216245adcabde36fb2c6e829b452f10f3adc9037f1461305e2e3cc3e89025560ac3d621b90b94eea152c9c3e0c53a6c6f9512
diff --git a/mail-client/alpine/alpine-2.25.ebuild b/mail-client/alpine/alpine-2.25.ebuild
new file mode 100644
index 000000000000..7d853c64fc2a
--- /dev/null
+++ b/mail-client/alpine/alpine-2.25.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+	https://repo.or.cz/alpine.git/patch/fb2217ac67706e4cbef69bea41041e2fb8b910e9 -> ${P}-ssl.patch
+	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 ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads"
+
+# alpine-2.25-ssl.patch can only be applied when not using the chappa patches.
+REQUIRED_USE="chappa? ( ssl )"
+
+DEPEND="sys-libs/ncurses:=
+	virtual/libcrypt:=
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	spell? ( app-text/aspell )
+	ssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+src_prepare() {
+	default
+	if use !ssl; then
+		eapply "${DISTDIR}/${P}-ssl.patch"
+	fi
+	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*
+	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
+}
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 8b195dc6ee83..6ce60793c2a6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-3.40.3.tar.xz 12216768 BLAKE2B 7b146ee09abff566a5a0cbbda9dda6ce5cd26c076462fd511cbc02fa35352d1ab776c67c5c99990278963a6f96c2ea8410588925cce1c05300e34ad5252de618 SHA512 08fcfdafd78ee323a57355dec1c8755525eefb599b70e6fb60ed0e9963a538a4b3f172b78f03aecbd245741fad08363b01ada46c2e349a9ccdc080d28c286452
 DIST evolution-3.40.4.tar.xz 12219300 BLAKE2B cbe56014252e8a23debbd4055be85d8bf89e25aa677b92880a6dba78d5d5fbb452403d5f9199b0257ca4c7ee10bff3bc5ca7601fa74390cf6d01d4d7cf099d1d SHA512 f6f08ab3cbc21397a0727b1edc5e37711294fdba6e537000d5a9f11f0142f69702fffad3922645fab256ccdee348b914a87abd0e6ed843c01762ccd32333518a
+DIST evolution-3.42.0.tar.xz 12243112 BLAKE2B fc79c75b4a684da8d0c09fbc8b682095704d9446c93909d57947083fb5798b622efdb4dc52423bc10bdd392e8f05f4968cbf119dd3ffad737403934e9ef5f68a SHA512 435155a69ef324ff3b0f85c9f0ed3206a7dfe12bd8ad5e9a87dff5de839e837417147e81faa93c57f207dff4d92cdc36ac3856402493ff693055f267aed5cbeb
 EBUILD evolution-3.40.3.ebuild 4156 BLAKE2B efda580e566f9f234b1c96252a5af675386f479a3b166a5a356eaecae7f83b2a4b9b140648ee1df755838dc303179ae656080c4c4bf48c19c10c0badc4d9feba SHA512 c007a759e42e4190e7c9c7a8c741c43fb2fa5d2eb126017f8b2269c8bd1af907ef42d2386849860724388d604bf0deaf066f9706a36597aeee74851352230f36
 EBUILD evolution-3.40.4.ebuild 4157 BLAKE2B 28fe2d273facbca610e00017c053661f2c1380076b00601a63d71c3dbfd22a47c61e000adad7ffe0434c889231c228240d7a3f68fffdade8127290001d54f2da SHA512 6f7259a25900aa06e7fd5166565311f28ad17fcb37cedddb149c194414bb4296b9543f1a6fe5f17a7ee6a82a7d9f8cdab2926fcffe69b8d3e0dc89fb2200c7b6
+EBUILD evolution-3.42.0.ebuild 4158 BLAKE2B 20d944a401e2f8cd3ac032a089a6d3b126dc9daa1a0c42e8c18e210360e6cd59c1944283df0a51ad3edf2413d33ff57d0637be629c265693ac7bd5817028314a SHA512 68777f37ecb80c4178b6fe72994fffe7fa92ac4f848abf26e4a1529f6ecc5de118eb73c7154693c159d14304a2d0d936cf5c453c6b574514a8164262fb781578
 MISC metadata.xml 1078 BLAKE2B b3a32d1876342fba5db22aae478cf1194df56f01719c6322f13a069e9fe8d1f17123b9592e0a0c5c25ac856ddbb9d20266bc11ce7c9a4737aa7dd43e76c0aa8d SHA512 9c3da89a72cc8235f73fb98b2cbe21597a4889ebd4d989a98e105613e131a42236ed115c0ac88cb87a312a43123c5bdcc44aa76328bf3cd537367553691408f1
diff --git a/mail-client/evolution/evolution-3.42.0.ebuild b/mail-client/evolution/evolution-3.42.0.ebuild
new file mode 100644
index 000000000000..141bc4cc9c0c
--- /dev/null
+++ b/mail-client/evolution/evolution-3.42.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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="~amd64 ~arm ~arm64 ~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
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-libs/glib-2.56: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.28.0:4[spell?]
+	>=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 )
+	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 )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	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
+"
+
+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_src_prepare call, if that works
+
+src_prepare() {
+	cmake_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_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_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/neomutt/Manifest b/mail-client/neomutt/Manifest
index 74166daeda4a..582edb46bcb8 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,6 +1,8 @@
 AUX 0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch 1175 BLAKE2B a01218e92fb230f7adeacec1803acf80d8e2c44494109deae9b261012c84e1b8eda160f2e663504d30f0d67a52ab39be206b18b04d35a5da3d0b8f29f0ed7f34 SHA512 6bfeb433b5d9ff16e70b7765efd537cb6cb27c5fab9396fed88f1ba3d683a90308afd1a6c7b25af44c5b3d53f54138d6bd671d8330999b402dc887a5af7ca424
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
+DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c07d25753358cde4f3be0897a04f1fa54828e7cbe7435d004adc49afa40bcfd80ad7e9a8f4c4e7b11ebd7d7f7f60a2a SHA512 b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
 EBUILD neomutt-20210205-r1.ebuild 4404 BLAKE2B e9ac5596196d2d9ac8c462bc099adf7f775bb782c821f978ab5d9811f8cd7df3ebc1d4a0de9cfe39d4712265def68c6b22d94948859d33e55bc56dfd72d4ed30 SHA512 e374e339d62b4807da033d5b1907f43064773763e38e157b3f9de6d48b41209efbe84bbbcc61fe5325b09ba1f8b6e2f632e5c4e3c7dd2b28a62d2861ec1c1261
+EBUILD neomutt-20211015.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
 EBUILD neomutt-99999999.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
 MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184
diff --git a/mail-client/neomutt/neomutt-20211015.ebuild b/mail-client/neomutt/neomutt-20211015.ebuild
new file mode 100644
index 000000000000..dd0fe7e9a572
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20211015.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~s390 ~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_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/roundcube/Manifest b/mail-client/roundcube/Manifest
index 039f22e19514..31b6868090ce 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,7 +1,9 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
 DIST roundcubemail-1.4.11-complete.tar.gz 7048262 BLAKE2B aaf5e6ce5b07577f687788730bc9181334402bb2ff5e78fb306425913b62b4a8f72505547bdcc8673806b48b9ba8252b8059b59399efc95a51877d5c672a4760 SHA512 2bfe0ff3716f76bf9eb5bf5f7b62c738b233c57e67d6ac767c044d1a3a694ae003642d9cc68a18d6f6ba94135aa7ee1692db920e9127128669faee9ddf78fe80
 DIST roundcubemail-1.5-rc-complete.tar.gz 7683911 BLAKE2B e67bbb8ad3d5ffa69091c18b519f78a3dc6d4cc1783921aab9de3c86351d2946cbf784267f5db69434da25413ad1f961161289b47408f14d9e6fa26d8b1e0999 SHA512 4e49e91bb53546e6ac348e33e64019afeee2ce6b78caa4375148fc6fac5abbe8e5db42670c5527e3678abe838ddf349275353e7919584d751bf4c321a62fe795
-EBUILD roundcube-1.4.11.ebuild 2272 BLAKE2B ff467e66c84492af33462c4f26b896344b43ae10585ad551afc105e8fe76e0878bac85b98adf17c0fed649509e3cb2c77e5670a4589510364cdecfe97085d606 SHA512 2a8d669a627042f377f61ee1b742e39a59cf2e3b65f3f8497106624970a5e3a1001b5d1d4d57cf0e7a2a1224244da58eb228c04d29c371b310cc34612320f5d6
+DIST roundcubemail-1.5.0-complete.tar.gz 7802014 BLAKE2B d81a521c264b47b55b7f868caf4fd8f0d7fdb2f0d04bf560bf1774c39aa4d0b4143ba1edb977941a4596848921671ec47a0dfd21f20f7e28778a021d58bec402 SHA512 cba32ee2b86864af9d9163d83fa49763267e3420bee59b86d47b889e1bc53871ed2ff5b2c1444778324f4b259e99752faa3b72f909a8f9c26c7af9c96ba08a54
+EBUILD roundcube-1.4.11.ebuild 2289 BLAKE2B 3e24731cb8fa44a45ff7c34aeaf0f2766849d1cec59e6c5ae26fb639443e9288889e435a976686328860fdd6bc64b98369d0ad585f879b57202cdbf6dbdd6d06 SHA512 858450c270914701ad910de943f35985c538a817cc325cef345ed6d582507fc365b3df11df2d1f800c107cebd3cd8ed0251e5d055dcb568f91423c5c62017bc6
+EBUILD roundcube-1.5.0.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5_rc.ebuild 2337 BLAKE2B 5e2f9c8fbacc0ad8130170a4c6cf63de55608cc714b1e3d7539b92a0ac1dc0c9a16fce52c8b25b0398ea4aa7313d52d7f87442cacb46f824ee55ec7fe708815b SHA512 1cb7e351fcd9537f4201aa31128eb8db02ea27398068978b33bc6b602f97a361e885b88e6a3c799afe66a55e6a615a6fdad9a38dfe7f10115a5cdcf3fee7a15a
 EBUILD roundcube-9999.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 MISC metadata.xml 1118 BLAKE2B 2872ed8444c98f6c9f96642089c879225e14ee2b53ad2dc70b307a82b8a1e0988e19c24fc9da8f98c63bacd6cfb105941ee5a5bc8e4ee756e216e0dd6d970e84 SHA512 3bb6ac4d95aaa94e0a23f1382b79220de90a45f45e1c98dac00c91e4bf12d35646c95b633713896062c729777e0ec57a6ebcc5d4d1b416105dc63378b50afb47
diff --git a/mail-client/roundcube/roundcube-1.4.11.ebuild b/mail-client/roundcube/roundcube-1.4.11.ebuild
index cb9a6709c782..9e557b1fae0c 100644
--- a/mail-client/roundcube/roundcube-1.4.11.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.11.ebuild
@@ -25,6 +25,7 @@ need_httpd_cgi
 RDEPEND="
 	${DEPEND}
 	>=dev-lang/php-5.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	<dev-lang/php-8
 	virtual/httpd-php
 	change-password? (
 		dev-lang/php[sockets]
diff --git a/mail-client/roundcube/roundcube-1.5.0.ebuild b/mail-client/roundcube/roundcube-1.5.0.ebuild
new file mode 100644
index 000000000000..e63578dfa2c6
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.5.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+
+# 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"
+
+IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.5.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	virtual/httpd-php
+	change-password? (
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		app-crypt/gnupg
+	)
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
+	EGIT_BRANCH="master"
+	BDEPEND="${BDEPEND}
+		app-arch/unzip
+		dev-php/composer
+		net-misc/curl"
+else
+	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		pushd "${S}" > /dev/null || die
+		rm Makefile || die
+		mv composer.json-dist composer.json || die
+		composer install --no-dev || die
+		./bin/install-jsdeps.sh || die
+		popd > /dev/null || die
+	else
+		default
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}