Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 88 insertions, 9 deletions

diff --git a/mail-client/roundcube/ChangeLog b/mail-client/roundcube/ChangeLog
index 927d41e80095..03feecd5e00b 100644
--- a/mail-client/roundcube/ChangeLog
+++ b/mail-client/roundcube/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/roundcube
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.142 2014/10/08 21:43:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.143 2014/12/21 00:55:37 radhermit Exp $
+
+*roundcube-1.0.4 (21 Dec 2014)
+
+  21 Dec 2014; Tim Harder <radhermit@gentoo.org> +roundcube-1.0.4.ebuild:
+  Version bump.
 
 *roundcube-1.0.3 (08 Oct 2014)
 
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 865a14686b68..c6773d486d35 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -3,18 +3,20 @@ Hash: SHA256
 
 DIST roundcubemail-1.0.2.tar.gz 3980298 SHA256 1c1560a7a56e6884b45c49f52961dbbb3f6bacbc7e7c755440750a1ab027171c SHA512 4076be3846f3c39c481c5546d7d2f8843cd87f1dde868aa06c9432db4a8786269e4297975802c841a0476ae4462cb7dbcc40e375bdafb6ea0a74b9c5ba9bb780 WHIRLPOOL 773b9f687dc82fdc2a879187d40bd79936d3103427a28e35b602eb7648ea397be5afeb412ff9523ff59653d50a7c3ac9ea4f14eec605e41e88158fc2f628d426
 DIST roundcubemail-1.0.3.tar.gz 3984245 SHA256 8840bb6c1b08d35eeb35dff5e8d40f7771d19bae8cb65d13753f71a538f9a9ca SHA512 164f095a93f6b6216f3344072ffe90727a328838fcc58d69eb6f1ca3fd17138fd8256520d3e22f6cbfe03c99246abdce2dddb58c22f2b96798e1607f0e02c4db WHIRLPOOL 3e557e8bd79afbd5263b11b9b0ca2483d6445e2dcf668e9629f809ce1e49f9e1a7f15ff026dfc9ab6b4666dc9b402ac94d6ddf997df63f27bed84b9a3e170610
+DIST roundcubemail-1.0.4.tar.gz 4055848 SHA256 ef890de63cadaad2a75435c22345c589362c8e82b0986eb4d980d3f657275226 SHA512 eb434d9eca19e000f5b10ba3339aaf64318003a43918b5465512eeb66651011b45ec0e361ee060b3f77beb09d5c3717559e5e512b8819ead9019d79feb39409d WHIRLPOOL 1e24b57fcae46530c0d4b5eadb861ab23af1cffc55df7834ce7fa7109976f83e5a57d2c789f40bd594a2055e069bbd3614ace79d324787ee73c062bd9ef8c7f0
 EBUILD roundcube-1.0.2.ebuild 2260 SHA256 f8ff72b863772656c75d284fa439a7b8136f17f8c403d9e5aac8569725f246f1 SHA512 fa8b01dba06e18badaeea2e1b0b3f13369463f8a6c9f5f4084d660db95617b56dffb70e4dca9f7b422486f604e0864f69b10f47a0276c0d9d723bbfd48ef895d WHIRLPOOL 05e852f52d79d57be91cd93553242056ce139e86d462cab58aaa7c5e61482c2df76ff319845903746bcfe11211509c039cb50aab9a93acb67173841daf79e2f1
 EBUILD roundcube-1.0.3.ebuild 2270 SHA256 8de81aeaa3443471a90c8dc2216fcd442de1c75ffdeaa5113eaa141058d3a88f SHA512 b297b249787206aa72a1946ffbb3327723fc0b0c13401456790c877b6a8ba4bb8b22cb3270723622d7842ee09e9be927e872144d02ef70b82616fcab3340c732 WHIRLPOOL 988cd0120c59be71a0d272b7fdc03e7144236644fa0d9a438fa3afa5dab9fa6ce31b87bec304a13a3776d9c9917a06f46a7c103b94ba9a420365182696d5f8e5
-MISC ChangeLog 19069 SHA256 ff9d6ac8a8fef3a446daa1bf6980c1ded99847f7c62b138130c7185687cfd877 SHA512 cf9f1b496af42ad4f19bb1d08aa411d0c065df597128d78952604ffc316d80db98017b25b40d2577ed5dc9568a7c7dffd4504972d05eedc0e5314abf521fa06b WHIRLPOOL fe28e55d806b3b0ed33a3947fc92c0d3244a2db892eea3f7d4ba6be75f68e7613a73158316fa7c3a004ae5f301235580c671113a982a825877a125895ed14016
+EBUILD roundcube-1.0.4.ebuild 2270 SHA256 396239e11089d28528e887f002517ab113d5690650672126e216e7ec704088d9 SHA512 ad43c0b34ddfcd7e1f39e040d2c0e891abbe87e2e84bc775fc57b4a4403d6a8d8ebe02d0eb14bdb6d565828d398fb2de779f48442bb2f86b4720e40b047f5062 WHIRLPOOL 1eaff7a33d14c986e2f46d415c48c7a9e59200316bb48087ac2cc3fd1e57337a72d20d0747e2c1feb37935a50f641ca9c4d69dc87838cc62436e9cdc9a123064
+MISC ChangeLog 19192 SHA256 fec2db5fbe10cece5916bc8fdd3da66b1fe0e03e0ca71b92fc9f01172ba79ed4 SHA512 14a5717b8fb2490ec4acfb3a627f4b668be1719392591606106e94e965f6321946fc9a85d335f1cc66416a3eda19514f44b4a45b9aaabe6154b38c39742ca8c6 WHIRLPOOL 2a8fbcade0498501a651cd833710d358b9eec8b66f76dc9cc8af29580cc4bc920480aeae26e576040560b30d57176afa858a37847df036659a0f5414d5ea9178
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUNbA5AAoJEEqz6FtPBkyjjUQH/2cuTwBcQsRlg43oFL69LXFT
-583TDhmgsPt6exmgd0VUvxp6WcvGxYU76ry7ClrFdnXaQI8g7VUFueMDpRgRjL/m
-Glviv/uSWFbAu0OhoasdVOSwP/eEvuTr3sF4moZwqwS18PRzg71Wt4okWK9jZMjl
-UM9qQVnAiGQCKe5NddLx9LEmxxhdWNJhzYE77zxME4Z3UogZyLkXe1oQFnAUW5nr
-4aqew7JhO5GSwvpydP+ty7DFf72rqA8D5jcm7ZMk5C0qh7/tD6yL+4UaFrwYTja8
-PdOjfYYTHiR98Hglsf5sG9hGs489Z4r1GQsYWXFArYtJWl7vdTBkCZs+tE9Gdvo=
-=LslD
+iQEcBAEBCAAGBQJUlhqVAAoJEEqz6FtPBkyj+BUH/iVvP5/nzolJsl0KeudrzTjS
+4Z/ffRzTipcCiSNT8HZYNfgP3X6KQK940RtVSrNCrXSfDrHS/vp3vkxQRoRnYLvH
+GivzpE/gXUEzshyUpxSQw83cBk0jVZhVZ+kYMUkp5nc8gKdGCik2DkHXCV2+5P09
+9EBOgBWHpzRMKTkaGoh1KbzlhcqVAfhDigLOIxlZ7b6lftCjj9Q9ncBo5KiFGfWe
+KuQeK0OPDxUgEBAqhIKONNS/tiPxpjbOW/A8wzNhzgc7/YCAsz+ntQu7jDESSTjp
+aSAeXaN9k8koGZ0qgyR17KADDWjg0nhJkgpYyt6zSddNGNY0UycDbhtW8yQ/FYw=
+=eQtF
 -----END PGP SIGNATURE-----
diff --git a/mail-client/roundcube/roundcube-1.0.4.ebuild b/mail-client/roundcube/roundcube-1.0.4.ebuild
new file mode 100644
index 000000000000..a9eafef78436
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.0.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-1.0.4.ebuild,v 1.1 2014/12/21 00:55:37 radhermit Exp $
+
+EAPI=5
+
+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="http://roundcube.net"
+SRC_URI="mirror://sourceforge/${MY_PN}/${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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap +mysql postgres sqlite ssl spell"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.3[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,ssl?,unicode,xml]
+	>=dev-php/PEAR-Auth_SASL-1.0.3
+	>=dev-php/PEAR-Crypt_GPG-1.3.2
+	>=dev-php/PEAR-Mail_Mime-1.8.1
+	>=dev-php/PEAR-Net_IDNA2-0.1.1
+	>=dev-php/PEAR-Net_SMTP-1.4.2
+	>=dev-php/PEAR-Net_Sieve-1.3.2
+	>=dev-php/PEAR-Net_Socket-1.0.14
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	spell? ( dev-lang/php[curl,spell] )
+	sqlite? ( dev-lang/php[sqlite] )
+	virtual/httpd-php
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Remove bundled PEAR packages
+	rm -r program/lib/{Auth,Crypt,Mail,Net,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 UPGRADING
+	webapp_src_install
+}
+
+pkg_postinst() {
+	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 "Run the ./bin/update.sh script to convert those"
+	ewarn "or manually merge the files."
+	ewarn "The new config.inc.php should only contain options that"
+	ewarn "differ from the ones listed in defaults.inc.php."
+}