gentoo new year resync : 01.01.2021

10 files changed, 403 insertions, 18 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 4348003b96fc..c6c1c01a19ad 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/bower/Manifest b/mail-client/bower/Manifest
index dca5c2bcca9f..65c84604c562 100644
--- a/mail-client/bower/Manifest
+++ b/mail-client/bower/Manifest
@@ -4,4 +4,4 @@ DIST bower-0.12.tar.gz 275436 BLAKE2B 66ea4d0a502f9948bd7af29c6d63bd7c0c382d91a8
 EBUILD bower-0.10.ebuild 863 BLAKE2B 00dc12562b8f20578ebc31d666ead3bb9fd05f3e056244ecbb46bcab8b59065c2fdc5159de7e4b0679b507e7ecdd716b2efbb28dfd9605eaf07a107088597e28 SHA512 742e0dd2a351067e1b04fb23275ad8c61b5bbea25b4a31f0c3071095bfc207182db6c8889e3515dd9dbd6cc44d7806d376930147d714ae59757996fda1ed4cc2
 EBUILD bower-0.11.ebuild 862 BLAKE2B 50f5228a48a7972dc641444f5ae6cfd60e18f9d299666dd53bb3159136a44b4bc6b034e9bcf8572c20903b703e30b17c7d8119a621b9e23d278da5f8f5e10d85 SHA512 f707009b28174392b266179ff9b5c87ca5db53ab727c043602001fcdfd45577bfdf533f39947b4278fdbc0a056e00231fd02a6f00545aa108eda9907bdd540b2
 EBUILD bower-0.12.ebuild 854 BLAKE2B 56914a8e6dd86584e8fbae1acd7c994af4f161bb194badd33432c6ee99afd3dfc67e0d600e8ebb711cc353c9691dc8da93a1ef5c471baa8161761a4a94c3402d SHA512 29c7ace36133c804de56f055e80a95e3d9e1b3d69a199308804573be5cd66db60bc29130395fdad085fa959ed7ce4f4c2f2a36e5be65cb0eb8800adbb49dfe18
-MISC metadata.xml 587 BLAKE2B 753c2059998f84038452433d8e37b9be03e57a083f6f957a51d981400dc6f148f0e321f1673fdf97bcaea2e7747991ce2974167beb51c1f4c297cd3daf0d984a SHA512 26aa7efaa2c97a4c2c51d40d74f97fca2d5521cdc51ce7b99277ba7cdaea00c119c28353802e2b9024ee1a7829d0be890158d16f01bd33083af6ecb2cc58f78c
+MISC metadata.xml 389 BLAKE2B a09020cbce6ed8e4d346c5373ae818b8741efcad65d894709a5760968361d731fdaff1ff5458601817d311d76ba81e5f18ee40aae7c623b65e39ce72bfa8afdc SHA512 3c6a3d5a83e56530370ae4ff0ec1c67d3ced1e0c21c6b6cd9868066ba6f43b15768063c79e8a2948aeca16e19c44dd746f824620a6a9437734707282b5cf4910
diff --git a/mail-client/bower/metadata.xml b/mail-client/bower/metadata.xml
index 0d11f2881462..e50139e4ba05 100644
--- a/mail-client/bower/metadata.xml
+++ b/mail-client/bower/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@seichter.de</email>
-		<name>Ralph Seichter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Bower is a curses frontend for the Notmuch (https://notmuchmail.org)
 		email system, written in Mercury.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a48e32e0e5f6..8fc04a12b536 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,8 +2,11 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
 DIST mutt-2.0.3.tar.gz 5292808 BLAKE2B 323a63b1b4ece774674b6f207ae51ffb58e57fd90fa2a44d8a69bb5311bf66318f8d6e8ca20b333bb7e3bea1ef995ab84f1f6cd8486ee91fbfdb90e2d64444b9 SHA512 6511f6690137f2cd8798a6c76a6f1a6305b2ddaad9bf339ec7144f6c249fe9cbcfb5bfbbdd308fcc6829b7fa12132b14d555dd3a9ef9e9b46c9748e2f31be852
+DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
 DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
 DIST mutt-gentoo-2.0.3-patches-r0.tar.xz 26396 BLAKE2B 1ee41baedb2ade72437ec4ffbd617e7e8a07c432ae2c025001df7fc19b2e6181e54f25dd16f02027f03f0f9df0032b35088354ae8c2c238a57fea2c3407dee4e SHA512 290416aa72d6938c9f52f60702ae1a9306704a3c63ca35c8fb35902c8e2307da42b478718521ebe0d6b857089b778bc172cd9cf5f061fab56fe5dea47c01f792
-EBUILD mutt-2.0.2.ebuild 8040 BLAKE2B 09feff54740471654e9d689f4ccec5e003c25d080d699dc54c5eb17fdaa1a736345dbab7793fcf3fa19dbd355e4a3444d8673128dcd3c9c50eb32e1b41e47f2f SHA512 74a4d88cfbd5520f1cecd3d960fbb3ea48d8eea5af65823be075132b1b856ee61d50bcffb613d71b729cd8708722d80feb7edabcc7ded230264f70fdb46c748d
+DIST mutt-gentoo-2.0.4-patches-r0.tar.xz 26448 BLAKE2B 7f2e2730e18def7281cf59bc783ebc4047e459ebb8796810507ff11f5e99b78c2d6914be154251f1a279b4963156825931e22cd727e86eb40c15637736be457e SHA512 16025a790fba20ba1e693b1b826bf86bd2697d0d3ab5ceaf08b1692902235ef40866daec80862c7082a82a58fa4f9631889688f1d06b864cb29c613725fe5024
+EBUILD mutt-2.0.2.ebuild 8041 BLAKE2B 0722cd74cc8b016f889b685dd200bbdbdfb8c3d44d0ebd2942fcfa9dd4a5148b5a5bf97bd56c9fb457d1aad39753084ffb3bfa58f9fc3dcd6c590169b38304e5 SHA512 264b09dcd7947c3dd16e32ccace1031b5d2c0ac5b4126046cff458a74879bd55d4d1a6ccff09877d9196d275f3b341fd58a63287723e4bcc3a62daff988c773c
 EBUILD mutt-2.0.3.ebuild 8047 BLAKE2B 686ed4ca740e3f3f71bbbbf2529cfde6c0af4ddc4ff78462204c6717fad6d75607d185803c957a58433317f7244a0bdee2ce791132b13e8516c4301e925be6db SHA512 3ac34bc6f403122b8b303b0a9dc8a8dbfdf5fab5ff814afbb141c6367c5d637122ad6494085b8782fa0450cf45bee90ed160f332c6a268fb53de5ab5d4004145
+EBUILD mutt-2.0.4.ebuild 8047 BLAKE2B 686ed4ca740e3f3f71bbbbf2529cfde6c0af4ddc4ff78462204c6717fad6d75607d185803c957a58433317f7244a0bdee2ce791132b13e8516c4301e925be6db SHA512 3ac34bc6f403122b8b303b0a9dc8a8dbfdf5fab5ff814afbb141c6367c5d637122ad6494085b8782fa0450cf45bee90ed160f332c6a268fb53de5ab5d4004145
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index 5747c19c4da7..6ea867b6524b 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 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 ~arm64 ~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-2.0.4.ebuild b/mail-client/mutt/mutt-2.0.4.ebuild
new file mode 100644
index 000000000000..098178a82427
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.4.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	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 )
+	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic smime)
+		$(use_enable gpgme)
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--without-bundled-regex"     # use the implementation from libc
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc/${PN}
+	if use mbox; then
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# include attachment settings, it's mandatory and shouldn't harm
+	# when not being referenced (index_format using %X)
+	{
+		echo
+		echo "# mandatory attachments settings, not setting these is a BUG!"
+		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
+		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
+	} >> "${ED}"/etc/${PN}/Muttrc
+
+	# add setting to actually enable gpgme usage
+	if use gpgme || use autocrypt ; then
+		{
+		echo
+		echo "# this setting enables the gpgme backend (via USE=gpgme)"
+		# https is broken due to a certificate mismatch :(
+		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+		echo "set crypt_use_gpgme = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
+
+	# nuke manpages that should be provided by an MTA, bug #177605
+	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+		|| ewarn "failed to remove files, please file a bug"
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 5dcff13aba3a..9e5460ff6775 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,6 +1,7 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
+DIST roundcubemail-1.4.10-complete.tar.gz 7043181 BLAKE2B aa442c9e4fb4d31bc9ddd77d888637d9d7afb8ac6c264ca5d378bd7bfc160f2f31379fae208638b2f79e6127add83f0254d1526e22c2ca24656b31ee75dc695e SHA512 e0a661ae5b928ce2c93129775d32a679ad2512ca4af21e8dd1711d38a62818ff9ee1e1fc922aae68e0a8bca034ca780fc3e3e988731a2ce9b2190b2c1d8e08a6
 DIST roundcubemail-1.4.8-complete.tar.gz 7032822 BLAKE2B 61c5329d9abe65baba3274d3cb9a6a435f886a0196c2881153da473eb415ad4c63dfdab49c67c75a2fd92ff55f9e6da7bdfcece7041ce408b2be628da47045d4 SHA512 8b7734cdec95954b7e18a0e44957da6ef74b5b0c3d28a1449e8634faa230844f5e0c28954245641758f8b2d9102aa32f279765ed3dfa20fa7b00dee4e5347362
-DIST roundcubemail-1.4.9-complete.tar.gz 7043437 BLAKE2B a1b7c6e160d29f61e2ca9c25f725b55411cb52c0f0d00fc4b3dc2ab1eb0edf190176ec932a297d6052b34047673e5dfb8cb13ad3a7b8b755e9d8e9265fb85aa9 SHA512 c6395757544b85693e808234f3dc6baac618ba115fb2c9eefc309ee18e74b2fdfbc0af00ac2b3b980fdd2abc56eefde47b535cdf688cfd2a5ce975786aca6572
+EBUILD roundcube-1.4.10.ebuild 2280 BLAKE2B 58c1e1ae779e5df8a48263227ea5e675809653f7070ecd12250fb4224089d9689a7096b73682fe89e70a87190b2bbfaf3729d8ce5d49c0bd7464efa24b91e8d3 SHA512 06035fda968d1e94d19207e9d040805e7fbd61edf93bc36e3a72895c0a3c5e41ae1ef463dd97847554dcb26239ddff362efc370c28ce34cbce1f87b03279b73a
 EBUILD roundcube-1.4.8.ebuild 1792 BLAKE2B 6ee68871faba7e25719ea805518faf117e5619cc265235e7df8189d557af0fbc48b4c1ee14f1241854e64bae810f05679d6a154a209795c2738fcd8e5f7b3626 SHA512 60ecc662e19e21ba510947dcb07db3dd62912f675ca9b5c1a4502df456d6be8109c7803b8e4322b307ca9daa28cc70ab39f037b7f290e14e96fa1c2539cb1862
-EBUILD roundcube-1.4.9.ebuild 1801 BLAKE2B c1ffa52b415ee208cc39cbfb9d04a96bf79d0ac6dd8b385c5de52aed64bfe72a7c4dda038f122db5d42a4b0406e4807b7b5acc938f2d9b17a773bf24a52a7866 SHA512 2c72d3d5ae3ad265ee8a219077cf935df68f1783f32a11057b209c5846a19dbba73af1e1ce05d01ec1200324d0bebb4d52be613d8fc29de3a026b5daa4c13e47
-MISC metadata.xml 888 BLAKE2B 08166287c0fc134f79884a6bd5cf96d67ab12a74422393d0ef8b4c89b588911e03d587f99bc62bff132494d021fc03b79fbe25a3a7e19ac9ae3107495f2d45c5 SHA512 c5522fd989d08c1de91aac7783e7fb8cbdf94669ca645357b58b3565ed604a52bf563d6417f28b6e2833ad51ee65ec4dfb76412ba88e1b280e346ad8d35b4f86
+EBUILD roundcube-9999.ebuild 2280 BLAKE2B 58c1e1ae779e5df8a48263227ea5e675809653f7070ecd12250fb4224089d9689a7096b73682fe89e70a87190b2bbfaf3729d8ce5d49c0bd7464efa24b91e8d3 SHA512 06035fda968d1e94d19207e9d040805e7fbd61edf93bc36e3a72895c0a3c5e41ae1ef463dd97847554dcb26239ddff362efc370c28ce34cbce1f87b03279b73a
+MISC metadata.xml 997 BLAKE2B 60bf23d71ef0014f432b1f09779263618f12eb2de5adb51e14b6c491d69c7a6b15d92f050d145d83d6ba0a6fc04b67906477ff1b6ce34d69c0ccf90cc2aaff1f SHA512 ed338883744882344de018e49854eaf1e6fdaf4af5a15cde8baabea5f315ff2904c1d161499ba68ba988e355336b962c1d6dcc64b550f2ef8875ece77f97ae83
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
index a250c22d53a2..ea20d1f28957 100644
--- a/mail-client/roundcube/metadata.xml
+++ b/mail-client/roundcube/metadata.xml
@@ -5,6 +5,10 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
diff --git a/mail-client/roundcube/roundcube-1.4.9.ebuild b/mail-client/roundcube/roundcube-1.4.10.ebuild
index e3ccf0af49aa..54ae74d1e868 100644
--- a/mail-client/roundcube/roundcube-1.4.9.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit webapp
 
@@ -11,12 +11,10 @@ MY_P=${MY_PN}-${MY_PV}
 
 DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
 HOMEPAGE="https://roundcube.net"
-SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
 
 # 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"
 
 IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -43,7 +41,32 @@ RDEPEND="
 	spell? ( dev-lang/php[curl,spell] )
 "
 
-S="${WORKDIR}/${MY_P}"
+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
+		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
diff --git a/mail-client/roundcube/roundcube-9999.ebuild b/mail-client/roundcube/roundcube-9999.ebuild
new file mode 100644
index 000000000000..54ae74d1e868
--- /dev/null
+++ b/mail-client/roundcube/roundcube-9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 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 ldap mysql postgres sqlite ssl spell"
+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.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	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
+		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 INSTALL README.md UPGRADING
+
+	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
+}