summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2009-12-01 07:44:58 +0000
committerBenedikt Boehm <hollow@gentoo.org>2009-12-01 07:44:58 +0000
commit6e2ec20d964cc0cbafe7a53ee2faa2618efb09c7 (patch)
treedc3102ec46903b043fdd5e3ade9f7ec1e8e3d467 /mail-client
parentold (diff)
downloadhistorical-6e2ec20d964cc0cbafe7a53ee2faa2618efb09c7.tar.gz
historical-6e2ec20d964cc0cbafe7a53ee2faa2618efb09c7.tar.bz2
historical-6e2ec20d964cc0cbafe7a53ee2faa2618efb09c7.zip
fix #294956 (sqlite should only be forced if neither postgres nor mysql are selected)
Package-Manager: portage-2.2_rc49/cvs/Linux i686
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/roundcube/ChangeLog6
-rw-r--r--mail-client/roundcube/Manifest4
-rw-r--r--mail-client/roundcube/roundcube-0.3.1.ebuild10
3 files changed, 12 insertions, 8 deletions
diff --git a/mail-client/roundcube/ChangeLog b/mail-client/roundcube/ChangeLog
index db78b6d10aa1..a03a4e60d078 100644
--- a/mail-client/roundcube/ChangeLog
+++ b/mail-client/roundcube/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-client/roundcube
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.16 2009/11/30 18:22:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.17 2009/12/01 07:44:58 hollow Exp $
+
+ 01 Dec 2009; Benedikt Böhm <hollow@gentoo.org> roundcube-0.3.1.ebuild:
+ fix #294956 (sqlite should only be forced if neither postgres nor mysql
+ are selected)
30 Nov 2009; Brent Baude <ranger@gentoo.org> roundcube-0.3.1.ebuild:
Marking roundcube-0.3.1 ppc64 for bug 294679
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 1966625ea66a..2650da6cae4a 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -3,7 +3,7 @@ DIST roundcubemail-0.2.2.tar.gz 1703629 RMD160 c813e2bcfc7ba75c23b85ec620f819c12
DIST roundcubemail-0.3-stable.tar.gz 1888994 RMD160 1b24903a9f67d200ea7548325ae833d35b3aff5a SHA1 cbc2b08e7d29cfdd455275c26818214eb725a736 SHA256 11b1618692000b82c4fde26527b2cf5c18850eb6f48c6c0004758c39308dfd04
DIST roundcubemail-0.3.1.tar.gz 1917564 RMD160 1047e50a0476eb53a8b27df0b12e95ab187a1c41 SHA1 3927bb99c20210fc539130865d2654e96e2d5390 SHA256 78b7160e58fc3692591e8a909464a858500768e5e7a7c076b496a7caf119ddd1
EBUILD roundcube-0.2.2.ebuild 2593 RMD160 cf11851859d0befb2e58aeeca683440c1ba74e58 SHA1 040f7c25ba6b699da32c0273bf37163f03312b0c SHA256 aedc1d632959bc7ce4eca61875111b2c2e6d3089deb2246e8dd0f89925d568ea
-EBUILD roundcube-0.3.1.ebuild 1896 RMD160 2e76278395c092a58615eb6ad23d5f971bce97b9 SHA1 1794bc060a1b7e2b84d34e8f71a0211e85119721 SHA256 d79cedee0490027f2b9529fb17bc2ade6f11b443e54dde9d3d97f23558d7d398
+EBUILD roundcube-0.3.1.ebuild 1873 RMD160 db94fcb36e6f6150299e9248da46c3a6155afe55 SHA1 9b0f39d1eb78c7f22f5fb70a5e1e275189f91816 SHA256 62eaeff9252c0f8a019f17fbe72a2c1c319655c44cdfe09943d75ff5f5f82f17
EBUILD roundcube-0.3.ebuild 1904 RMD160 6e304fa03d57a747d0f276817d01fbf8c303b2ed SHA1 8943eef3caba1deed7f68bea0e9be17b7dca45dd SHA256 d5c7723fac0c4c7c1154ad7269aec4a71e1a6f4c006ce93c21094bd22e42a938
-MISC ChangeLog 2295 RMD160 c2c236300a3c496a6d4d11fdf33af61d60dc833c SHA1 c6ef4433029f5fab551541b552b764a844a34da2 SHA256 63262f0832e51b8a384f7983f158fe553b42c74adc24fb4b4e10421ac575b499
+MISC ChangeLog 2460 RMD160 474700315ceff7e21b631b2af50976549274045e SHA1 e55ae86e27a037465948187fe13c307382fe0d48 SHA256 fd614eb9efe4a186a6321cb992838318f8f253309d75a68a6370c55c2e702170
MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
diff --git a/mail-client/roundcube/roundcube-0.3.1.ebuild b/mail-client/roundcube/roundcube-0.3.1.ebuild
index c61d1e2a15c9..197daa6caf2c 100644
--- a/mail-client/roundcube/roundcube-0.3.1.ebuild
+++ b/mail-client/roundcube/roundcube-0.3.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.3.1.ebuild,v 1.4 2009/11/30 18:22:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.3.1.ebuild,v 1.5 2009/12/01 07:44:58 hollow Exp $
EAPI="2"
MY_PN="${PN}mail"
MY_P="${MY_PN}-${PV}"
-inherit confutils webapp depend.php depend.apache
+inherit webapp depend.php depend.apache
DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
HOMEPAGE="http://roundcube.net"
@@ -17,10 +17,11 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
# for bundled PEAR components, googiespell and utf8.class.php
LICENSE="GPL-2 BSD PHP-2.02 PHP-3 MIT public-domain"
KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE="ldap mysql postgres +sqlite +ssl spell"
+IUSE="ldap mysql postgres ssl spell"
DEPEND=""
-RDEPEND="dev-lang/php[crypt,iconv,ldap?,pcre,postgres?,session,spl,ssl?,sqlite?,unicode]
+RDEPEND="dev-lang/php[crypt,iconv,ldap?,pcre,postgres?,session,spl,ssl?,unicode]
+ !postgres? ( !mysql? ( dev-lang/php[sqlite] ) )
spell? ( dev-lang/php[curl,spell] )
dev-php/PEAR-PEAR
"
@@ -31,7 +32,6 @@ need_php_httpd
S=${WORKDIR}/${MY_P}
pkg_setup() {
- confutils_require_any mysql postgres sqlite
use mysql && require_php_with_any_use mysql mysqli
# add some warnings about optional functionality