gentoo resync : 25.01.2018

16 files changed, 325 insertions, 536 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 87a98b9b06fe..74edd6d6194a 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/drac/Manifest b/mail-client/drac/Manifest
deleted file mode 100644
index 166de64f2ea9..000000000000
--- a/mail-client/drac/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX drac_rotate 2540 BLAKE2B f2a9a9616e5a345b634696b12d9853102711be33c57004d69fcd01056716c0edffce32cd453cda41b51eb9f3a1156ca9a5916fc04e551545fa49dfcf0ff04de3 SHA512 ea7b36ba661d1e85254cd7125ad33006a4e0c378254a05f2de6e7a2121483d16b499f8ca8025e9b01e836a04ad9fa6a2ce3c8752e256c2d0fa4952e50387dcfc
-AUX dracd.rc6 403 BLAKE2B 791c850d947ed53fc1200e12d1f4024cf1518f5647d7dc9d4fae3f2eb7d9dfd84805c610c943601f680fb73193a716cb643c9c472de17795cb8945e77a7e2e8c SHA512 04011ae461fdfaa751507fd5b59721fcbc5d624c52b6c7007431ae2e331d2ebe9111e75bd2273809ca3e26f1aff438751f994a3b1243ea85045625e45f4a6ed5
-DIST drac.tar.Z 20705 BLAKE2B 2622fb6dddd5c2b8258c64585b49a6af304fbb8236af42c546e7b8a403d7c6050cd83b90f903266d9d54499508fb4965461e09c676f30f1935b5d39b5352f796 SHA512 09f14c5e72f9ca68b12039c16215d29f7d8e8940046b79dc9bb8f2363188b6fdd253af7ca41e42369ed67d5e4f5d6c20b3d3bf9f27cd194c53a7fc6e619b29fc
-EBUILD drac-1.12-r1.ebuild 1844 BLAKE2B 7eab99ff5900631916399323fb93499ab4b0ff13e67edf024f4d0b4dd8cabf7f0a732cd7a944a6f6091f37f90c31cf9d93b1a2c5537ccfd1f916054cdb8d94c3 SHA512 d87f9e5dc6e0b1c09ee5635eedba83b20be6498c3ade6d8468081568ea7362d19df4a210efe48ee38a1fb259b95685eac3e72d0081eeba1f6f0faee629ee56ac
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/drac/drac-1.12-r1.ebuild b/mail-client/drac/drac-1.12-r1.ebuild
deleted file mode 100644
index faabd717caab..000000000000
--- a/mail-client/drac/drac-1.12-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A robust implementation of POP-before-SMTP"
-HOMEPAGE="http://mail.cc.umanitoba.ca/drac/"
-SRC_URI="ftp://ftp.cc.umanitoba.ca/src/${PN}.tar.Z"
-
-LICENSE="rc"
-SLOT="0"
-KEYWORDS="x86 sparc ppc hppa ~amd64 ppc64"
-IUSE="debug"
-
-DEPEND="virtual/mta
-	>=sys-libs/db-3.2.9
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	>=net-nds/portmap-5b-r6"
-
-S="${WORKDIR}"
-
-src_compile() {
-	local mysed
-	if use debug ; then
-		mysed="s:^CFLAGS.*:CFLAGS = \$(DEFS) -g ${CFLAGS}:"
-	else
-		mysed="s:^CFLAGS.*:CFLAGS = \$(DEFS) ${CFLAGS}:"
-	fi
-
-	sed -e "s:^INSTALL = .*:INSTALL = /usr/bin/install:" \
-		-e "s:^EBIN = .*:EBIN = /usr/sbin:" \
-		-e "s:^MAN = .*:MAN = /usr/share/man/man:" \
-		-e "s:^DEFS = .*:DEFS = -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C:" \
-		-e "s:^CC = .*:CC = $(tc-getCC):" \
-		-e "s:^LDLIBS = .*:LDLIBS = -ldb:" \
-		-e "s:^TSTLIBS = .*:TSTLIBS = -L. -ldrac:" \
-		-e "s:^RPCGENFLAGS = .*:RPCGENFLAGS = -C -I:" \
-		-e "s:^MANADM = .*:MANADM = 8:" \
-		-e "${mysed}" \
-		-i Makefile || die "sed failed"
-
-	# Parallel build does not work.
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	newsbin rpc.dracd dracd
-	dosbin "${FILESDIR}/drac_rotate"
-
-	dolib.a libdrac.a
-
-	newinitd "${FILESDIR}/dracd.rc6" dracd
-
-	dodoc Changes COPYRIGHT INSTALL PORTING README
-	newman rpc.dracd.1m dracd.8
-	doman dracauth.3
-
-	keepdir /var/lib/drac
-	fowners mail:mail /var/lib/drac
-	fperms 750 /var/lib/drac
-}
-
-pkg_postinst() {
-	elog "After configuring your IMAP/POP server for DRAC, and starting the"
-	elog "dracd server (e.g. by running /etc/init.d/dracd start) you can"
-	elog "set up your MTA to check for authenticated hosts in:"
-	elog "   /var/lib/drac/drac"
-	elog "Please see the MTA documentation for more details."
-	echo
-}
diff --git a/mail-client/drac/files/drac_rotate b/mail-client/drac/files/drac_rotate
deleted file mode 100644
index 45cce3a4dc4d..000000000000
--- a/mail-client/drac/files/drac_rotate
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-
-usage="[/path/to/real_file.db [/path/to/link_file.db]] [--debug] [--verbose]"
-help="
-A DRAC-enabled MTA performs better by using a seldomly, instead of
-constantly changing, access database.  This script creates a link
-to a snapshotted database which the MTA can use.  It is designed
-to run every minute from cron.  Here is an example cron configuration:
-
-  *  *  *  *  *   $(basename "$0")
-"
-
-for i in $* ; do
-	case "${i}" in
-	  --verbose | -verbose | -v | --debug | -debug | -d)
-		debug=1
-		;;
-	  --usage | -usage | -u )
-		echo "usage: $(basename "$0") ${usage}"
-		exit 1
-		;;
-	  --help | -help | -h)
-		echo "${help}"
-		echo "usage: $(basename "$0") ${usage}"
-		echo
-		exit 1
-		;;
-	  *)
-		args[${#args}]="${i}"
-		;;
-	esac
-done
-			
-debug_print() {
-	if [ -n "${debug}" ] ; then
-		if [ -n "$2" ] ; then
-			echo -n "$1 ... "
-		else
-			echo "$1"
-		fi
-	fi
-}
-
-check_result() {
-	if [ "$?" -ne 0 ] ; then
-		debug_print
-		if [ -n "$1" ] ; then
-			echo "$(basename "$0"): $1, exiting ..."
-		else
-			echo "$(basename "$0"): exiting ..."
-		fi
-		exit 1
-	fi
-}
-
-debug_print "finding current minute" "1"
-min="$(date '+%-M')" && \
-[ -n "${min}" ]
-check_result "can't determine current minute"
-debug_print "success! (${min})"
-
-debug_print "finding drac database file" "1"
-real="${args[0]:-/var/lib/drac/drac.db}" && \
-[ -n "${real}" -a -f "${real}" ]
-check_result "can't find drac database file"
-debug_print "success! (${real})"
-
-debug_print "setting drac link file" "1"
-link="${args[1]:-/var/lib/drac/drac_link.db}" && \
-[ -n "${link}" -a -d "$(dirname "${link}")" ]
-check_result "can't set drac link file"
-debug_print "success! (${link})"
-
-debug_print "finding new drac database" "1"
-new="${real}$(( ${min} % 3 ))" && \
-[ "${new}" != "${real}" ]
-check_result "can't set new drac database"
-debug_print "success! (${new})"
-
-debug_print "finding old drac database" "1"
-old="${real}$(( (${min} + 1) % 3 ))" && \
-[ "${old}" != "${real}" -a "${old}" != "${new}" ]
-check_result "can't set old drac database"
-debug_print "success! (${old})"
-
-debug_print "creating new drac database" "1"
-cp "${real}" "${new}"
-check_result "can't create new drac database"
-debug_print "success! ($(basename "${real}") -> $(basename "${new}"))"
-
-debug_print "linking new drac database" "1"
-ln -sf "${new}" "${link}"
-check_result "can't link new drac database"
-debug_print "success! ($(basename "${new}") -> $(basename "${link}"))"
-
-debug_print "removing old drac database" "1"
-rm -f "${old}"
-check_result "can't remove old drac database"
-debug_print "success! (${old})"
diff --git a/mail-client/drac/files/dracd.rc6 b/mail-client/drac/files/dracd.rc6
deleted file mode 100644
index fb8e2f109d53..000000000000
--- a/mail-client/drac/files/dracd.rc6
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net portmap
-}
-
-start() {
-	ebegin "Starting dracd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/dracd \
-		-- -i -e 5 /var/lib/drac/drac.db
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dracd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dracd
-	eend $?
-}
diff --git a/mail-client/drac/metadata.xml b/mail-client/drac/metadata.xml
deleted file mode 100644
index 9a6d80e5da48..000000000000
--- a/mail-client/drac/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
-</pkgmetadata>
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index d5e228a2876a..afb005289ab1 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -8,6 +8,8 @@ EBUILD neomutt-20171006.ebuild 2785 BLAKE2B 2bfd22e3165a509db8ac7620388cfdd18fd2
 EBUILD neomutt-20171013.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
 EBUILD neomutt-20171027.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
 EBUILD neomutt-20171208.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f
+EBUILD neomutt-20171215-r1.ebuild 3960 BLAKE2B 1e47347a16c8c0f31c2c89f2173e106dfc78f369564bcd4dac1850649dbeb5ebc71afb9094a5a4f8e52c1c8a8ad1bedf0af5839ee4eaaa55b89df52fc22a5dc6 SHA512 5cc4e2c11e859a1d17f96091ffa97bc0ca3843e6debe2dc4dbba05ab71950f47852404bfb89244e7ec2e4b2d60bdf9c4ff6bbc25ce5262637201189bca571a3c
+EBUILD neomutt-20171215-r2.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-20171215.ebuild 3470 BLAKE2B 0612a05bd1f2250b350a02b8868fecf1a8711ea246531352012c8894ef118fe50834a16800f464d31e9b30ebed427980c214e1c38f83cb68fe34d15512af4fc9 SHA512 96ef8e7f5e8e2a674ece11e400943545f07d71b7b694a25f41b31bf36cb52080f2c9509954fc8b83f1dd4a8b1c3ae935a1101c0e52b75e2acc649a000b5dfa4f
-EBUILD neomutt-9999.ebuild 3912 BLAKE2B d2b7ed25c443f1192663e9e98bbfb62c269a2f3897b82bbbd80bf2c0749760b695942b8b05f6f9ec0c139d80ea2d02061b52c4b37a870969eb2d4dc0cd1b5b31 SHA512 a50ce190784904f012624a707371046b04771a77dbb7b7cd633b8a16e7ed2d6fd54d9977585da94f1bb10e51cf1d1a2430ec4e8478f071b05e29325d39b61635
+EBUILD neomutt-9999.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/neomutt-20171215-r1.ebuild b/mail-client/neomutt/neomutt-20171215-r1.ebuild
new file mode 100644
index 000000000000..e5725c955639
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171215-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 9999$ ]]; 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/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	smime_classic ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? ( >=sys-libs/db-4:= )
+	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 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	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 )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		# During the transition of the crypto USE flags we need to support
+		# both sets of flags. We do not want to emit a configuration setting
+		# twice, since the second flag overrides the first, potentially
+		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
+		# details.
+		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
+		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
+		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-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 "${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 '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use crypt || use gpg || use smime; then
+		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+		ewarn "(https://bugs.gentoo.org/637176)"
+		ewarn "crypt -> pgp_classic"
+		ewarn "gpg -> gpgme"
+		ewarn "smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release."
+		if use gpg && ( use crypt || use smime ); 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
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-20171215-r2.ebuild b/mail-client/neomutt/neomutt-20171215-r2.ebuild
new file mode 100644
index 000000000000..f90289f77c00
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171215-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 9999$ ]]; 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/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	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 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	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 )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		# During the transition of the crypto USE flags we need to support
+		# both sets of flags. We do not want to emit a configuration setting
+		# twice, since the second flag overrides the first, potentially
+		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
+		# details.
+		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
+		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
+		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-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 "${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 '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use crypt || use gpg || use smime; then
+		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+		ewarn "(https://bugs.gentoo.org/637176)"
+		ewarn "crypt -> pgp_classic"
+		ewarn "gpg -> gpgme"
+		ewarn "smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release."
+		if use gpg && ( use crypt || use smime ); 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
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 7b36a57de365..f90289f77c00 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,14 @@ IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
 
 CDEPEND="
 	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
+	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 )
@@ -99,17 +106,16 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# A man-page is always handy, so fake one
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
 	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
+		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
 	fi
 
 	dodoc COPYRIGHT LICENSE* ChangeLog* README*
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index d6d9118c8eff..10871484c63b 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,15 +1,8 @@
 AUX POST-UPGRADE.txt 1101 BLAKE2B b162d5e445195412a126b0977b1f21b6619757ba0a8cef4aeb7da84850707b4476e15819ebc903b49b904ca9118db796ede72f8f4917283d46a933ed24a77226 SHA512 715c6c377b9816f0f836acace019c39cf22d536d1a0ae5538cbf3dcf3fec12ae584450881264dab792c941627f1af649f776bca6d5015b13c08648fde726b948
-DIST roundcubemail-1.2.5.tar.gz 3602701 BLAKE2B 26e8a2bb13cdb3432dee14d2bea5f0fb5d52d2478df69009ef4d6c725c2d9ff1ce37784f97a217e84177aaff049c597a477e307e90f7f96baabfc73762217fcf SHA512 8f17c8222a59123e438a3683e5f2fbfef28c966899a271a2a11c25535e7188ff57846847108190a4d20ff53eccd10a2a7e88e8a5f958e9bc38c69e53824e7928
-DIST roundcubemail-1.2.6-complete.tar.gz 3893031 BLAKE2B ea13f007a2405d351aebe721cdff3405c6e25f6fea517c8214e206a7cc98d75a55236f6fbec73a1094dbcb7b082969bf97b1faf8e202852aea9f5c625f7d6682 SHA512 4b33ddc322446cf4d7915d9f57fa11946fb6056f91034ff9643363a87ad293d444bacf2a6e6502bbb8b57623f39548b7a6fff02f4bb70622843ecbc489949024
 DIST roundcubemail-1.2.7-complete.tar.gz 3904612 BLAKE2B b001a9c57f2358b00e0290493f0bfb82001c769987ef98e2d34d6e6d9432a5c612fab6ba10306279a8bb73d1015332f29f1233a10ee32fd7f713cbf44d9cf7b5 SHA512 545b3fe05ecfaede3d887ae71e41fc91aaaae280c71b67db9a5dcb516b5b238371327c2b1fabe87cf073cce38bc5a57b3db2592eb96d436bae280896c1f7017c
-DIST roundcubemail-1.3.0.tar.gz 3104348 BLAKE2B 049bfb0461073d7384d41c69d0a41ac428cce8f57276b004e8517d971d6b44090f567f847ef743b107b94956776d09f502f1a3fcf3c398cc473732cc294d35ad SHA512 f3ab39cc3eec9bbcaf3d8f5d9004b0da92fe5d35b71687acc234fab5772abb92d970855716288cba10c8609532d42ddc6e791a1f7bca13de555174a37deca9c4
-DIST roundcubemail-1.3.1-complete.tar.gz 5296647 BLAKE2B 24803ae2978dec1c65282b05a53d404ecf2022a0a97d929a9d09bfda26527d60faf514d8ca6d313b27a505a7f7db473997201b74595eb35b51cad868c9c59062 SHA512 79722d1213b6855af37dea4c2522eba12ded4ed430b5d96f5ba9eb851bbfbe68c406b0c5410e21e2721dfe2cf42fdc2fa825161a229f785921ebdc89221ab232
 DIST roundcubemail-1.3.3-complete.tar.gz 5339032 BLAKE2B bb0b595ba13947db3b0644ad5bc76fa8280ac74733e3bf02a758ffaa49fb0c2ef80005081fb1f24500fa767b57d0df59751abb098a807bc6e04b5a63de3fc1ed SHA512 1f634fbc5d0967f28a7aa990a9b23f105b93030d43927237fc9b5decabe1b959de75c7c21bdb27389ec53730378565e7f309d7c009be427c7615372634273931
-EBUILD roundcube-1.2.5.ebuild 2287 BLAKE2B 544ec8419520b61f5fbcf90b8baaf091addbbc1aaef9552b6839578650065b6dbe42909fba5ad8a9fa824cc08202298be763759d1ce29d82f66d9a6b8feba145 SHA512 466f244cb0ca5331d2efbb2405a62ccec2d72500863abaf84885f5aa9d0b1f3ee827158cb029d2e9c34f9ffac0e4d962064401a07f1337f7d056c488eeaead19
-EBUILD roundcube-1.2.6.ebuild 2291 BLAKE2B 9ad13708e037c46abfe6e80a94537341b3ed34b1ba5eace570e6e457922639b4c39ff298f3dea7393f471dc6e7206179c0862db907681cbdc7c8e6bd23786164 SHA512 075bceea29886deebaf479a5d483d2848d9defbefab82a27d7241db644b19fda5576676fb91fc6cfec01e5f8a2c802accf9cebe5884f69643bc48695e2401fa7
+DIST roundcubemail-1.3.4-complete.tar.gz 5506887 BLAKE2B de353400706d893b8e95b23e20ebcab7478273bd6dbd009c766537826e260cd98f065f9d7d38740c60254ccbecd376ec6aafe82791be177bbee6ffc8d61a733b SHA512 e3442651bf762ceda3cb9ff78cb512703a7f82466d7de860848d1c9471f10b2561c2dd7a570218048fbc0df0fa573c6e2381ba8c0063e718c531c8ce1138a5e4
 EBUILD roundcube-1.2.7.ebuild 2288 BLAKE2B ef3b09f4a0d1c163d9c14602b6a727c30832424bc7e877750c1af38648aa92b752a43c40a7e3d437261ca63dc5507703e5803b5d018f515657e167de171a1f5f SHA512 4bdc130b46067ff1b2cbc5d19a8c4498e096b2b3a0958c204d5823007e36d8e63d0c68f595e175b8c705c789daf507d6219ea7e08e1c3561e4150a63181cd0d9
-EBUILD roundcube-1.3.0.ebuild 2600 BLAKE2B c24e85bbb04b08214a5e9caaa2981af20d706938a52e255aabb1cba10880ae692ebbd8c1628c15e6fb89a0995131cd37cabd2ce028ab9d1c5bdf7fd32e7478db SHA512 093d8b9632f499a9ab6cb6492abd8934f96c2f5ca7c5f141d143463b89c0cec441e5b36f808bce2e4cbef8f847463768cc75cfee3837b61d590ac3dda9ed16ca
-EBUILD roundcube-1.3.1.ebuild 2386 BLAKE2B e52d50b4f7e5e2b2b7461c95ea16394d35c2990882de1282c0bed5923755b8cd72a39a3e8d3b1bcf7ecf5895359c9b79a1b441db5814d69f0a6661f926cfe28a SHA512 83e1bcfac15cf0b3e50f504c2b09fe1da309b0fea2227250c8b47248c5101b0242cdbf1bd62ac141e28e48e58dffcb16cb496e0c3feb818868498fe6bc7c5e9e
 EBUILD roundcube-1.3.3-r1.ebuild 2380 BLAKE2B c58468a39a852201afc0b4233fb18d49967535187c3cd4d20b7ac5d67932388238d08a79b891e912d674afd5d8e5a230deb630aba4ce9a83d91096813811ae57 SHA512 89d66b6fe22a4797935d809d9a6518fc6c36c3b166906d6d9702fa4f1964fdda4197215ef84459e2b8c20eee18d75e6b421c0361811900d9f160b141708c1831
-EBUILD roundcube-1.3.3.ebuild 2386 BLAKE2B e52d50b4f7e5e2b2b7461c95ea16394d35c2990882de1282c0bed5923755b8cd72a39a3e8d3b1bcf7ecf5895359c9b79a1b441db5814d69f0a6661f926cfe28a SHA512 83e1bcfac15cf0b3e50f504c2b09fe1da309b0fea2227250c8b47248c5101b0242cdbf1bd62ac141e28e48e58dffcb16cb496e0c3feb818868498fe6bc7c5e9e
+EBUILD roundcube-1.3.4.ebuild 2571 BLAKE2B 44d6b55afcf14dbac2591fdf15621bdffa537f1476e57981233a006be1700d82c8e17a54ae11d3914b526a9ff6bd35462fdaeac58e00bf5aec32272f593c2666 SHA512 a613308c061b42b610fa837565217fc9140272be77376c8e54637fea8e41ae4aeca20f9118de8b9975d7ae555dd55d07d7fd0292487e18f137868ed5251fd6a1
 MISC metadata.xml 860 BLAKE2B 8135a487928f879b6dd9665e171dc18e53f4cdbada44b71e41891e376ce6e4c76a80cb85d3dbbb9303fdb2c4be330952c144305499c5193f52b2d3ab9e538307 SHA512 b17b6d05898493d08d52f08b333f762518442ae519b23e8f2811fb6a369c6b26688a380656e8e95d7da706834547d6fe7d52db6992ebf0bf5b9a30ad0d21c56f
diff --git a/mail-client/roundcube/roundcube-1.2.5.ebuild b/mail-client/roundcube/roundcube-1.2.5.ebuild
deleted file mode 100644
index 4ce1abb11e78..000000000000
--- a/mail-client/roundcube/roundcube-1.2.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${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/${PV/_/-}/${MY_P}.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 ~ppc ~ppc64 x86"
-
-IUSE="enigma ldap managesieve 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.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.0.6
-	>=dev-php/PEAR-Mail_Mime-1.8.9
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.1.1
-	>=dev-php/PEAR-Net_SMTP-1.6.2
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.4.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-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.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.2.6.ebuild b/mail-client/roundcube/roundcube-1.2.6.ebuild
deleted file mode 100644
index 1df11749a007..000000000000
--- a/mail-client/roundcube/roundcube-1.2.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${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/${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 ~ppc ~ppc64 ~x86"
-
-IUSE="enigma ldap managesieve 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.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.0.6
-	>=dev-php/PEAR-Mail_Mime-1.8.9
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.1.1
-	>=dev-php/PEAR-Net_SMTP-1.6.2
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.4.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-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.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.3.0.ebuild b/mail-client/roundcube/roundcube-1.3.0.ebuild
deleted file mode 100644
index 63c9997645d9..000000000000
--- a/mail-client/roundcube/roundcube-1.3.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${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/${PV/_/-}/${MY_P}.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 ~ppc ~ppc64 ~x86"
-
-IUSE="enigma ldap managesieve 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
-
-# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.1.0
-	>=dev-php/PEAR-Mail_Mime-1.10.0
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.2.0
-	>=dev-php/PEAR-Net_SMTP-1.7.1
-	>=dev-php/PEAR-Net_Socket-1.2.1
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-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.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-	ewarn
-	ewarn "When installing for the first time or upgrading from <= 1.2.5,"
-	ewarn "run the ./bin/install-jsdeps.sh script to download required"
-	ewarn "javascript files into the ./temp/js_cache/ folder."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.3.1.ebuild b/mail-client/roundcube/roundcube-1.3.1.ebuild
deleted file mode 100644
index 37e237f45153..000000000000
--- a/mail-client/roundcube/roundcube-1.3.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_P=${MY_PN}-${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/${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 ~ppc ~ppc64 ~x86"
-
-IUSE="enigma ldap managesieve 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
-
-# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
-	>=dev-php/PEAR-Auth_SASL-1.1.0
-	>=dev-php/PEAR-Mail_Mime-1.10.0
-	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
-	>=dev-php/PEAR-Net_IDNA2-0.2.0
-	>=dev-php/PEAR-Net_SMTP-1.7.1
-	>=dev-php/PEAR-Net_Socket-1.2.1
-	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 )
-	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-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.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	ewarn
-	ewarn "When upgrading from <= 0.9, note that the old configuration files"
-	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
-	ewarn "replaced with one single config.inc.php file."
-	ewarn
-	ewarn "Run the ./bin/update.sh script to convert those"
-	ewarn "or manually merge the files."
-	ewarn
-	ewarn "The new config.inc.php should only contain options that"
-	ewarn "differ from the ones listed in defaults.inc.php."
-	ewarn
-}
diff --git a/mail-client/roundcube/roundcube-1.3.3.ebuild b/mail-client/roundcube/roundcube-1.3.4.ebuild
index 37e237f45153..fdb72d1c079b 100644
--- a/mail-client/roundcube/roundcube-1.3.3.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit webapp
 
@@ -26,25 +26,47 @@ need_httpd_cgi
 # :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
 RDEPEND="
 	${DEPEND}
-	>=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
+	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
 	>=dev-php/PEAR-Auth_SASL-1.1.0
 	>=dev-php/PEAR-Mail_Mime-1.10.0
 	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
 	>=dev-php/PEAR-Net_IDNA2-0.2.0
 	>=dev-php/PEAR-Net_SMTP-1.7.1
 	>=dev-php/PEAR-Net_Socket-1.2.1
+	dev-php/PEAR-Console_CommandLine
+	dev-php/PEAR-Console_Getopt
+	dev-php/PEAR-Exception
 	virtual/httpd-php
-	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg )
-	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 )
+	enigma? (
+		>=dev-php/PEAR-Crypt_GPG-1.6.0
+		app-crypt/gnupg
+	)
+	ldap? (
+		>=dev-php/PEAR-Net_LDAP2-2.2.0
+		dev-php/PEAR-Net_LDAP3
+	)
 	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
-	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
 	spell? ( dev-lang/php[curl,spell] )
 "
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	default
+
+	# Redundant. (Bug #644896)
+	rm -r vendor/pear || die
+}
+
 src_install() {
 	webapp_src_preinst
+
 	dodoc CHANGELOG INSTALL README.md UPGRADING
 
 	insinto "${MY_HTDOCSDIR}"
@@ -56,6 +78,7 @@ src_install() {
 
 	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
 	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
+
 	webapp_src_install
 }