4 files changed, 103 insertions, 2 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index bd4e9cd97107..e853debe4d67 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index f0ea7e1a8f93..f1e29eea3d66 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -2,7 +2,9 @@ AUX POST-UPGRADE.txt 1101 BLAKE2B b162d5e445195412a126b0977b1f21b6619757ba0a8cef
 DIST roundcubemail-1.2.7-complete.tar.gz 3904612 BLAKE2B b001a9c57f2358b00e0290493f0bfb82001c769987ef98e2d34d6e6d9432a5c612fab6ba10306279a8bb73d1015332f29f1233a10ee32fd7f713cbf44d9cf7b5 SHA512 545b3fe05ecfaede3d887ae71e41fc91aaaae280c71b67db9a5dcb516b5b238371327c2b1fabe87cf073cce38bc5a57b3db2592eb96d436bae280896c1f7017c
 DIST roundcubemail-1.3.3-complete.tar.gz 5339032 BLAKE2B bb0b595ba13947db3b0644ad5bc76fa8280ac74733e3bf02a758ffaa49fb0c2ef80005081fb1f24500fa767b57d0df59751abb098a807bc6e04b5a63de3fc1ed SHA512 1f634fbc5d0967f28a7aa990a9b23f105b93030d43927237fc9b5decabe1b959de75c7c21bdb27389ec53730378565e7f309d7c009be427c7615372634273931
 DIST roundcubemail-1.3.4-complete.tar.gz 5506887 BLAKE2B de353400706d893b8e95b23e20ebcab7478273bd6dbd009c766537826e260cd98f065f9d7d38740c60254ccbecd376ec6aafe82791be177bbee6ffc8d61a733b SHA512 e3442651bf762ceda3cb9ff78cb512703a7f82466d7de860848d1c9471f10b2561c2dd7a570218048fbc0df0fa573c6e2381ba8c0063e718c531c8ce1138a5e4
+DIST roundcubemail-1.3.6-complete.tar.gz 5529370 BLAKE2B 49fd04d81b7047c61d33007b49aff2fe8d68fb0572d305b51aa0ae997c06e4924a3ff32861c19741f0c4d82adb9abb317781de8c1b324120e57d77f413cfa480 SHA512 fc1627d4b539742524c43b3faaa8cb5d64f934ad03f7cf8a461580a3a38dccb11140d08499b988742a0892534b1eda52f37a50f0911015983b6e27703294c70e
 EBUILD roundcube-1.2.7.ebuild 2286 BLAKE2B c7b34d0d45035d02fcfb59f5b43e1c49ffc60219579d709bff1c5b8d6b4cc5fcc426b94989079aba16e2a43defeb57460fdd2af9d3c8f5a4478ca8f8ab3d9a76 SHA512 b4b0075658f1331f086ca0bf34b1118475836468c7735dca32d77fac9981f60fd929c7ae24b736fa71eaec472e95699f0dc6fe1fb034c88c26bf457140f5632f
 EBUILD roundcube-1.3.3-r1.ebuild 2380 BLAKE2B c58468a39a852201afc0b4233fb18d49967535187c3cd4d20b7ac5d67932388238d08a79b891e912d674afd5d8e5a230deb630aba4ce9a83d91096813811ae57 SHA512 89d66b6fe22a4797935d809d9a6518fc6c36c3b166906d6d9702fa4f1964fdda4197215ef84459e2b8c20eee18d75e6b421c0361811900d9f160b141708c1831
-EBUILD roundcube-1.3.4.ebuild 2576 BLAKE2B 9b44cdcf73f993a7cef4f709ad2e624e61c27c494cd197d0c83458a1d03d66a363bdad7ba019c0bdb0034a441694c45a4e20f86300f884c3a1e2039052ba3a03 SHA512 b45ac03fb9bf93473c9176effcb5afab138fe0fe24a1a5d3d468aff59d3a086c89ebadcbb4771356a31a12c260284ad2a20ec6c5049acef68cd1ee3a5837bdb3
+EBUILD roundcube-1.3.4.ebuild 2575 BLAKE2B e5b4dbc799a81eec29fee1450374bd6612591af3162f9afcc2a409eb58403d8277d5ad80c78c2df9c53257cada33eeb623c32644427082c6d556af82c5ac709b SHA512 166a7d2a6c6170eed3d8a226c69628096f4bed573394491601b9cb9ecbdd8d37fc5b698d8dad50043d90f574e2bcd201d52a0256c5eb1aa7097960b3b77a8437
+EBUILD roundcube-1.3.6.ebuild 2578 BLAKE2B b3a54e1be6b915579fce3fc8cf34aa96e444f2d3979e75ed932f6ca309e86899f5bf3dcfe5fde4379ff232e6dc387564a6a20f48c0c122a22b782d39962f9f32 SHA512 6a0b1cf84993c5263d4134cb61c6d19d8684576cae9a1ef5e2cf5833f4ac422f575511523f6a67c1c56dead1c709b2883ea3776f5ee82a3880d708fbdcf3d010
 MISC metadata.xml 860 BLAKE2B 8135a487928f879b6dd9665e171dc18e53f4cdbada44b71e41891e376ce6e4c76a80cb85d3dbbb9303fdb2c4be330952c144305499c5193f52b2d3ab9e538307 SHA512 b17b6d05898493d08d52f08b333f762518442ae519b23e8f2811fb6a369c6b26688a380656e8e95d7da706834547d6fe7d52db6992ebf0bf5b9a30ad0d21c56f
diff --git a/mail-client/roundcube/roundcube-1.3.4.ebuild b/mail-client/roundcube/roundcube-1.3.4.ebuild
index 6731a407526f..2f2cce8e7736 100644
--- a/mail-client/roundcube/roundcube-1.3.4.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl
 # 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 ~sparc x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
 
 IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/mail-client/roundcube/roundcube-1.3.6.ebuild b/mail-client/roundcube/roundcube-1.3.6.ebuild
new file mode 100644
index 000000000000..09b004efbf4a
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.3.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 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 ~sparc ~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[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
+	)
+	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_prepare() {
+	default
+
+	# Redundant. (Bug #644896)
+	rm -r vendor/pear || die
+}
+
+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
+}