summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Legler <a3li@gentoo.org>2010-08-12 08:09:16 +0000
committerAlex Legler <a3li@gentoo.org>2010-08-12 08:09:16 +0000
commita05724409f18bfa2e5b19ba58c65668688b680ed (patch)
tree5ac31cf15278b67da8e39ee9664bb8003277601f /mail-client
parentNon-maintainer commit: Removing vulnerable versions for bug 294679. (diff)
downloadgentoo-2-a05724409f18bfa2e5b19ba58c65668688b680ed.tar.gz
gentoo-2-a05724409f18bfa2e5b19ba58c65668688b680ed.tar.bz2
gentoo-2-a05724409f18bfa2e5b19ba58c65668688b680ed.zip
Fixing previous commit.
(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/roundcube/ChangeLog6
-rw-r--r--mail-client/roundcube/roundcube-0.3.1.ebuild (renamed from mail-client/roundcube/roundcube-0.3.ebuild)14
2 files changed, 12 insertions, 8 deletions
diff --git a/mail-client/roundcube/ChangeLog b/mail-client/roundcube/ChangeLog
index 16f8eb780915..4b406054773d 100644
--- a/mail-client/roundcube/ChangeLog
+++ b/mail-client/roundcube/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-client/roundcube
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.22 2010/08/12 08:06:46 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.23 2010/08/12 08:09:16 a3li Exp $
+
+ 12 Aug 2010; Alex Legler <a3li@gentoo.org> -roundcube-0.3.ebuild,
+ +roundcube-0.3.1.ebuild:
+ Fixing previous commit
12 Aug 2010; Alex Legler <a3li@gentoo.org> -roundcube-0.2.2.ebuild,
-roundcube-0.3.1.ebuild:
diff --git a/mail-client/roundcube/roundcube-0.3.ebuild b/mail-client/roundcube/roundcube-0.3.1.ebuild
index a83c09f8a82b..0452ca747622 100644
--- a/mail-client/roundcube/roundcube-0.3.ebuild
+++ b/mail-client/roundcube/roundcube-0.3.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.3.ebuild,v 1.6 2010/01/23 18:40:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.3.1.ebuild,v 1.11 2010/08/12 08:09:16 a3li Exp $
EAPI="2"
MY_PN="${PN}mail"
-MY_P="${MY_PN}-${PV}-stable"
+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"
@@ -16,11 +16,12 @@ 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-2 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap mysql postgres +sqlite +ssl spell"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
+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