Update mail-client/roundcube-1.1.3

2 files changed, 21 insertions, 12 deletions

diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 8848e74a..7c40f77e 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -20,4 +20,4 @@ EBUILD roundcube-1.0.3.ebuild 3187 SHA256 9a2e13fa47e9125dd372bb1fabb926041b79fe
 EBUILD roundcube-1.0.4.ebuild 3187 SHA256 9663c662bfb5b46c5d4e3c96caf4a0073aa4a401309a8cc429b5011ca670d2bf SHA512 40ebdb1b9f051be150f6367e20806e11c22cbaabb3138b679b188558d82b2f99748a1e4de06ec14dd0b46f1283653780d81470f4f2be580859b3fddd030e89b3 WHIRLPOOL b1e1dea7e961c4b7ea9c0fddf98653fc6c8ba16382fa4cb73c8c1c0bff7d25be40830a8168b26b8306a2f1dbfc965284cdb44a1547279874bab061a777f3b630
 EBUILD roundcube-1.0.5.ebuild 3111 SHA256 0340557a2eade4e37d9736e68e628549b550106f913f111675a9ed67952cf13d SHA512 590a5ed56d3af3de531675b8e8f459085f92063ba2643196a3c5df8645598e6f14c0f7e235ba55ac4d47da1be1a542e884b2af79b72d135e324098d1bb7a9a58 WHIRLPOOL 76b94468bf8747d7d794eb2d43f508bfb8261f6d919b7776ac98cab84a51c33691ce411819bb052e070d6451eef3158760b18e2fe62c1bbccadf965b855bc7d9
 EBUILD roundcube-1.1.2.ebuild 3233 SHA256 940eb6a8f94b38f5e9290e516f964cfc5822adc4d7c94cd47e30786b58e9f779 SHA512 c0da0bfbeb440c419259095234fa7efcc400662cf264a80fb7885f3f6b062ffa79dc660c9ae6ee648188c74d8be7173357643ff7da1554580a27fe9d7b6dc190 WHIRLPOOL d2230eca29ed8eb0b366fd3ceea125af0fdeac1b162d6c1aacdec150666ccd871008c80f2d9dafe9e33f28c1d21df418e3a1043ddda104436412e0ef3a199b10
-EBUILD roundcube-1.1.3.ebuild 3233 SHA256 664c3140c78185b06fa8744185ee9c0312215e02a993878b8facf12900e498cd SHA512 d404f5a8e5e3a5167d842b774e273a171584fa96c2817ecc9da622898ce5ddc4e11eb63aeb7af15729c70c13d291436607d6eb7c199a4bd90461278ad91e308e WHIRLPOOL f073af9a4b69269a7380fd9bb6f88e6b750c7a64c7ccd1cdab9ee12b60217b9ab8a8fc8f4b399a021ef9e22eafe7e1297dd4dbfb97d1f76d1a1759b44b995e33
+EBUILD roundcube-1.1.3.ebuild 3401 SHA256 0211246f44382db1c8aa5c481686979be5a9f6b4e99dca1ac6f052e4fab07759 SHA512 8920dc4b75e7fe4edeed8c609e65a88e98072803292bcee184ea4ae620ae22eb7d3dcf35aaacdb3cb197fad2be0c5a319d0aaeba28d0fb2085a3c6b25a81c1db WHIRLPOOL 731f9469f48378c1f38c219c1ffe0bbdf5a51888dc8a4a197ca3c41dcf53c67db3021b1b839d127f874a175d3e66f7b158d32fff4e207093bde46ac2703e4a24
diff --git a/mail-client/roundcube/roundcube-1.1.3.ebuild b/mail-client/roundcube/roundcube-1.1.3.ebuild
index 05446cf3..aa0c9418 100644
--- a/mail-client/roundcube/roundcube-1.1.3.ebuild
+++ b/mail-client/roundcube/roundcube-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-1.0.5.ebuild,v 1.5 2015/02/18 09:16:49 ago Exp $
+# $Id: e9402115bf44dc662e5a2e2757dd296677e35107 $
 
 EAPI=5
 
@@ -20,27 +20,30 @@ RESTRICT="mirror"
 # 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="ldap +mysql plugins postgres sqlite ssl spell"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~sparc x86"
+
+IUSE="enigma ldap managesieve +mysql plugins postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 # The function below sets only DEPEND, so we need to include the latter in RDEPEND ...
 need_httpd_cgi
 
 RDEPEND="
 	${DEPEND}
-	>=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,ssl?,unicode,xml]
+	>=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-Crypt_GPG-1.3.2
-	>=dev-php/PEAR-Mail_Mime-1.8.1
+	>=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
-	>=dev-php/PEAR-Net_Sieve-1.3.2
 	>=dev-php/PEAR-Net_Socket-1.0.14
+	virtual/httpd-php
+	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.3.2 app-crypt/gnupg )
+	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 )
+	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 )
 	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
-	plugins? ( >=dev-lang/php-5.3.4[ctype,filter,hash,json,phar,ssl] )
+	plugins? ( dev-lang/php[ctype,filter,hash,json,phar,ssl] )
 	spell? ( dev-lang/php[curl,spell] )
-	sqlite? ( dev-lang/php[sqlite] )
-	virtual/httpd-php
 "
 
 S=${WORKDIR}/${MY_P}
@@ -72,7 +75,7 @@ src_install() {
 	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
 	webapp_configfile "${MY_HTDOCSDIR}"/composer.json
 
-	webapp_postupgrade_txt en UPGRADING
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en-0.6.txt
 
 	webapp_src_install
 
@@ -86,11 +89,17 @@ 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
 }