Fixing previous commit.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 24 insertions, 14 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/Manifest b/mail-client/roundcube/Manifest
index e2b53ec3c821..066a5c07517c 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,9 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX postinstall-en.txt 2513 RMD160 c2a04efcdd4007642221797a10877c2fc57ad874 SHA1 8bc888b2944694bbbadeddfe6f193c3a8a995a87 SHA256 5c1fa9d43f29158521188aae417654f968fb41662c46721b8183728df37eb4c4
-DIST roundcubemail-0.2.2.tar.gz 1703629 RMD160 c813e2bcfc7ba75c23b85ec620f819c1261c1f3f SHA1 ddb2340962bcf3ac24d026a6d97e9bd95cefaa3d SHA256 57df1dfa6b88973f74131adf0262de4fbf5217be3bc6739faeccff77a9dfffa3
-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 2599 RMD160 5c7c0e3fed5399a3da91b643e20f2cba116bf88e SHA1 55faf3555326de84fa56642d0e5c46fc858fec79 SHA256 e66a56dd034c3c5d705a9864bc2ba7a70a1329a2ec0c7c7c62150221fbf0cafe
-EBUILD roundcube-0.3.1.ebuild 1884 RMD160 3ef7932cd300eef35fec0d57fe0900d0d07f82e2 SHA1 aaded00f5ec1d217398ae9de98d3acdf8a151dcc SHA256 11e37fad087ce946f7690994e4dfbe083f48fcf89e103e9788ac54cc880c8bff
-EBUILD roundcube-0.3.ebuild 1917 RMD160 471bfd7707bd348febf70d3c4e54f68a9ceba1ae SHA1 a1d49ec24d7345faa59bd11e3bd2661ec4b7fc71 SHA256 213cf31945b768f64dd90b5888a071a4a6a6da1493d0b27d9bfa6d84bd1e2594
-MISC ChangeLog 2938 RMD160 edc62adec52abb9befba1429a82f0357d2010d39 SHA1 c7932b11d1af9e4747702ba5492f9928b6c044a5 SHA256 b22d301cca1c725b1638e03a9a5f459f5d1f3e5d9a363b4883680679c71a0187
+EBUILD roundcube-0.3.1.ebuild 1882 RMD160 eca129317d54272825e6783998dec4661a2ced36 SHA1 19ae136860254c7e43e36e75d538abc1f655c95d SHA256 9d94f7cb38cf3d2189fc64697dd618391b31a5be12ee37ada045fb1aa4089eee
+MISC ChangeLog 3224 RMD160 c223e5c775c880083c7d2ff45c8bb51339b1d067 SHA1 003f0a424dc733b11e4f862dd97f052ed5b80c01 SHA256 9a01395ac2a136b461ee32fb94c8b008b298f335d3e9730202674a8fcafe1501
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkxjrDcACgkQ3Ca6Xy8+rvQWugD/XavSzZlYBzJgNwCG53U1UEq2
+T20W6kSR1jcwANXzo4EA/RgSvOeMY3LwyYQ/qSABp5zs10kFltoMl6NxLddYPnJo
+=C4ct
+-----END PGP SIGNATURE-----
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