www-apps/davical: Dropped the pcre use for >=php-5.3 as done for awl by Michael Weber...

svn path=/sunrise/; revision=11509

diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
index 138daca0854eca9dcb60c71887f778cfc8d18a85..fd1d2ab7a05dee6b49c8fbe53cd54588b07a4138 100644 (file)
--- a/www-apps/davical/ChangeLog
+++ b/www-apps/davical/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Nov 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  davical-0.9.9.ebuild:
+  Dropped the pcre use for >=php-5.3 as done for awl by Michael Weber (xmw)
+  (See bug #342597 - Thanks to Sven Schwyn (svoop) <svoop@delirium.ch>
+  reporting this on bug #343691)
+
   21 Apr 2010; lebarjack <francois.perichon@univ-lille2.fr>
   -davical-0.9.8.4-r1.ebuild, -files/postinstall-en-0.9.8.4.txt,
   +davical-0.9.9.ebuild, +files/postinstall-en-0.9.9.txt, -files/rscds.conf,

diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 8555d67095660d93b2df24d3302d264aedfa8b63..1bce56323d47595158c8c419a6a51d84d17e43e8 100644 (file)
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en-0.9.9.txt 829 RMD160 cd088da5602233551a9a2f57012b9ad2e1ebdf8d SHA1 257efaa0655ec85bdd71885cdd9ccc5b1900cb9c SHA256 9d3e8e91a6e464e50486f21f5d92620d41bba8a56719345a5e4a6b677fe5f1bf
 AUX vhost-example 433 RMD160 8ce2aee1f3bcad5ab296b3c09704630d533fbd38 SHA1 d0d5d1af9b0ce41866ddf034d048afc547820c88 SHA256 324589afec23b5d7f10b5c95a162cf0cdeb1e05253fd8f8206fffada95209ffa
 DIST davical-0.9.9.tar.gz 1949981 RMD160 74a4abecd7527b09e425dbff4b5c1cf845670205 SHA1 c1ec44757a769a5c999c8348958a8a6ad59379fc SHA256 9052f844b8b1139d62ec9f1cc8cb31a4f34d86b783476fe674148fe6fd99c96c
-EBUILD davical-0.9.9.ebuild 1707 RMD160 262591f251266dff5e5aa41c6ed20b3fce57a136 SHA1 73ea92a16d00805104d463062bf82a1e5e1f6c91 SHA256 ac389414249e2399c86e5e66ed6f185e4e454f135bfa7be7bc93082808dd50da
-MISC ChangeLog 4000 RMD160 9100f10b3cd8fdb4dd5162c9c90321300f10d9d2 SHA1 62718033b362d795ddb6c7a42a608c73f8186414 SHA256 b089134f3238a3ab8470a9a588a6e622e5ada28372f5d46e6f40d1158b12f2ba
+EBUILD davical-0.9.9.ebuild 1758 RMD160 0da88abdca7e5d68105794a6e8400ae3d493fbea SHA1 4758457dd71edf92c711097229926d22dd604608 SHA256 5b04e1cf0a09d9905a07a041a97d5025eed128f5cdb006c33ff128a97e8a18bf
+MISC ChangeLog 4265 RMD160 a1aa85ea541fa2f78aa57f48e9472c41afef796f SHA1 f7159436b828a990b7cf9c72f19f809c1a780d37 SHA256 7b3087cea9676eaf9a3638ba8cdfe65120ef2b65a425e9ddc4c4e586faa9eb8e
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/www-apps/davical/davical-0.9.9.ebuild b/www-apps/davical/davical-0.9.9.ebuild
index 011fba159166ee3bcc116e3eba99dd783fef17cc..8aa0ef70a1cf301acedf1a427fbb95b427380417 100644 (file)
--- a/www-apps/davical/davical-0.9.9.ebuild
+++ b/www-apps/davical/davical-0.9.9.ebuild
@@ -16,7 +16,8 @@ IUSE="doc"
 
 DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
 RDEPEND="app-admin/pwgen
-       dev-lang/php[pcre,pdo,postgres,xml]
+       || ( <dev-lang/php-5.3[pcre,pdo,postgres,xml]
+               >=dev-lang/php-5.3[pdo,postgres,xml] )
        dev-perl/DBI
        dev-perl/DBD-Pg
        dev-perl/yaml