diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2009-12-01 07:44:58 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2009-12-01 07:44:58 +0000 |
| commit | c52bd986f000ebf88b2706f9534a9a309b71e590 (patch) | |
| tree | 5154821ff9345ffc0ebdad9eee1e6ad733826e2e /mail-client/roundcube | |
| parent | old (diff) | |
| download | gentoo-2-c52bd986f000ebf88b2706f9534a9a309b71e590.tar.gz gentoo-2-c52bd986f000ebf88b2706f9534a9a309b71e590.tar.bz2 gentoo-2-c52bd986f000ebf88b2706f9534a9a309b71e590.zip | |
fix #294956 (sqlite should only be forced if neither postgres nor mysql are selected)
(Portage version: 2.2_rc49/cvs/Linux i686)
Diffstat (limited to 'mail-client/roundcube')
| -rw-r--r-- | mail-client/roundcube/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/roundcube/roundcube-0.3.1.ebuild | 10 |
2 files changed, 10 insertions, 6 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/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 |