www-apps/davical: New version for davical (Ex-rscds)

svn path=/sunrise/; revision=7106

4 files changed, 10 insertions, 27 deletions

diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
index 382b3a02f..bfc61df4c 100644
--- a/www-apps/davical/ChangeLog
+++ b/www-apps/davical/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Sep 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.5.ebuild, +davical-0.9.5.2.ebuild, -files/driver_ldap.patch:
+  New version for davical (Ex-rscds)
+
   23 Jun 2008; lebarjack <francois.perichon@univ-lille2.fr>
   +davical-0.9.5.ebuild, +files/postinstall-en-0.9.5.txt,
   +files/driver_ldap.patch, +files/rscds.conf, +metadata.xml:
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index e69c5c2a4..5fcbdc394 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,7 +1,5 @@
-AUX driver_ldap.patch 993 RMD160 94a1ab8ac1ecea422d9e0e9a482c1512f0637339 SHA1 82d4764003094a63a1203a0cb795cf7967a55387 SHA256 c5091d5ba48f6f963af3ed0735a31e96a7d9c624668e3992275cdc3de1383984
 AUX postinstall-en-0.9.5.txt 1014 RMD160 8d20edeefbc627bae1d025be057d629530821036 SHA1 7e6c71d17334834924cde3fd234f3bca61073469 SHA256 01c922524a1bd81b7f060fa58d4a0b8766587e1d93c6a6d6452306daaf5abce5
 AUX rscds.conf 11907 RMD160 bdd38b174cf76e2a2ea76da5ed09706d000ccd20 SHA1 12da666505dd8fb814e775f21f9bc7e623dc7597 SHA256 25d27389f72caf07e9c008bd1cfe791eac69a85309ab226946d9d7e4304ec9b7
-DIST rscds-0.9.5.tar.gz 657693 RMD160 a2129e6387153be1ae871547952efb8739d1eb16 SHA1 2343864d14ca193b166a6124a523e1b0ff4c99f3 SHA256 202f4167926646ee1bba9128817011835ee29fc33445d41ee5103d357de662db
-EBUILD davical-0.9.5.ebuild 1710 RMD160 6a369e159be5e284d746b53a9aa6351249cb3d6b SHA1 ec53386d8a323a9c1f3b34f860674231602e6a9a SHA256 be945e525875fa0787eb2959c4ba62eac558f6c899590d4aa87c4ec6592a61f4
-MISC ChangeLog 378 RMD160 7de401c585040e5cce403b44151af44673a0d712 SHA1 67c0652579f86a1ebc03660ba88700773fb90678 SHA256 c5ceee0d35768104bbf515e9fb5d0b7032e31a6231dddd2a2d1267a15bba21b3
+EBUILD davical-0.9.5.2.ebuild 1613 RMD160 3085513863eaa061dc1be35f9d8b0dc30bd3eafa SHA1 d9ffbb8ac028b312ea60c1a81e79b2fe91c99b08 SHA256 e8ba5f7cdfd193987e7858448e63b66ef90b21ab7b4fcd66b9c38029b10712ce
+MISC ChangeLog 552 RMD160 fa187220d7d566161981d57b53cd3f5f530e6417 SHA1 4310f8b8a84550420841dc3608d6aeb63822369d SHA256 3c0bb86e5948c7a06ff299bd576345ef3348d6e2f8212c0c9139ad89e98a4f77
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/www-apps/davical/davical-0.9.5.ebuild b/www-apps/davical/davical-0.9.5.2.ebuild
index 0d0918942..950c2de89 100644
--- a/www-apps/davical/davical-0.9.5.ebuild
+++ b/www-apps/davical/davical-0.9.5.2.ebuild
@@ -2,11 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils webapp depend.php versionator
+inherit eutils git webapp depend.php versionator
 
 DESCRIPTION="A CalDAV and iCal server"
 HOMEPAGE="http://rscds.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rscds/rscds-${PV}.tar.gz"
+EGIT_REPO_URI="http://repo.or.cz/r/${PN}.git"
+EGIT_TREE="r${PV}"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -20,8 +21,6 @@ RDEPEND="www-servers/apache
 	dev-perl/DBI
 	dev-perl/DBD-Pg"
 
-S="${WORKDIR}/rscds-${PV}"
-
 need_php5
 need_httpd
 
@@ -30,12 +29,6 @@ pkg_setup() {
 	require_php_with_use pcre postgres xml
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/driver_ldap.patch"
-}
-
 src_compile() {
 	if use doc ; then
 		ebegin "Generating documentation"
@@ -72,6 +65,6 @@ src_install() {
 	insinto /etc/davical/
 	newins "${FILESDIR}/rscds.conf" calendar.example.com-conf.php
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en-0.9.5.txt"
 	webapp_src_install
 }
diff --git a/www-apps/davical/files/driver_ldap.patch b/www-apps/davical/files/driver_ldap.patch
deleted file mode 100644
index d2683ac3d..000000000
--- a/www-apps/davical/files/driver_ldap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN rscds-0.9.5.orig/inc/drivers_ldap.php rscds-0.9.5/inc/drivers_ldap.php
---- rscds-0.9.5.orig/inc/drivers_ldap.php	2008-06-20 09:55:09.000000000 +0200
-+++ rscds-0.9.5/inc/drivers_ldap.php	2008-06-20 09:56:42.000000000 +0200
-@@ -105,7 +105,7 @@
-       if (!ldap_bind($this->connect,$config['bindDN'],$config['passDN'])){
-           $bindDN = isset($config['bindDN']) ? $config['bindDN'] : 'anonymous';
-           $passDN = isset($config['passDN']) ? $config['passDN'] : 'anonymous';
--          dbg_error_log( "LDAP", i18n('drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s'), $host, $port $bindDN );
-+          dbg_error_log( "LDAP", i18n('drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s'), $host, $port, $bindDN );
-           $c->messages[] = i18n( 'drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your LDAP server is reachable');
-           $this->valid=false;
-           return ;