[gentoo-commits] gentoo-x86 commit in mail-client/roundcube: ChangeLog roundcube-0.3.1.ebuild

[Benedikt Boehm (hollow)]

hollow      09/12/01 07:44:58

  Modified:             ChangeLog roundcube-0.3.1.ebuild
  Log:
  fix #294956 (sqlite should only be forced if neither postgres nor mysql are selected)
  (Portage version: 2.2_rc49/cvs/Linux i686)

Revision  Changes    Path
1.17                 mail-client/roundcube/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/roundcube/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/roundcube/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/roundcube/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	30 Nov 2009 18:22:06 -0000	1.16
+++ ChangeLog	1 Dec 2009 07:44:58 -0000	1.17
@@ -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@g.o> 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@g.o> roundcube-0.3.1.ebuild:
   Marking roundcube-0.3.1 ppc64 for bug 294679



1.5                  mail-client/roundcube/roundcube-0.3.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/roundcube/roundcube-0.3.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/roundcube/roundcube-0.3.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/roundcube/roundcube-0.3.1.ebuild?r1=1.4&r2=1.5

Index: roundcube-0.3.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.3.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- roundcube-0.3.1.ebuild	30 Nov 2009 18:22:06 -0000	1.4
+++ roundcube-0.3.1.ebuild	1 Dec 2009 07:44:58 -0000	1.5
@@ -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 @@
 # 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 @@
 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