www-apps/davical: New version of davical

svn path=/sunrise/; revision=12421

5 files changed, 40 insertions, 6 deletions

diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
index 9d169207f..d4f72ebfc 100644
--- a/www-apps/davical/ChangeLog
+++ b/www-apps/davical/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Oct 2011; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.4.ebuild, -files/postinstall-en-0.9.9.4.txt,
+  +davical-0.9.9.6.ebuild, +files/awl_location.patch,
+  +files/postinstall-en.txt:
+  New version of davical
+
   14 Jan 2011; lebarjack <francois.perichon@univ-lille2.fr>
   -davical-0.9.9.3.ebuild, -files/postinstall-en-0.9.9.3.txt,
   +davical-0.9.9.4.ebuild, +files/postinstall-en-0.9.9.4.txt:
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index a9047f01e..90e3ce1bb 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,6 +1,7 @@
-AUX postinstall-en-0.9.9.4.txt 829 RMD160 cd088da5602233551a9a2f57012b9ad2e1ebdf8d SHA1 257efaa0655ec85bdd71885cdd9ccc5b1900cb9c SHA256 9d3e8e91a6e464e50486f21f5d92620d41bba8a56719345a5e4a6b677fe5f1bf
+AUX awl_location.patch 1153 RMD160 3e4f86a5a3875b33cc4d05af17a83ab1f372345a SHA1 0ff4784259044e32e927a0a16f5502bbb9e72d0c SHA256 ae987efc9d5209aedd61039ee6b3e2724ba65cac5d33480c1060b8875231a654
+AUX postinstall-en.txt 895 RMD160 61e2a9dfb5c571e4b6467b16172e5161a70c47c5 SHA1 87cf264f588f0a715506b73af2cbdb80b6669ea5 SHA256 360c09900188462b35c561bf5595b70a5c967dd50e62298484c2022dc943b62e
 AUX vhost-example 433 RMD160 8ce2aee1f3bcad5ab296b3c09704630d533fbd38 SHA1 d0d5d1af9b0ce41866ddf034d048afc547820c88 SHA256 324589afec23b5d7f10b5c95a162cf0cdeb1e05253fd8f8206fffada95209ffa
-DIST davical-0.9.9.4.tar.gz 2194526 RMD160 89b12a13f061862c6269eccdb67faa448b0eebe1 SHA1 590d73bf2574449e81fcc3aabab2bf450eee683a SHA256 944a18de89d8db12e47cacdfbeea7bbc02f2c6fdefbfc025a2ee8899fa2b8411
-EBUILD davical-0.9.9.4.ebuild 1758 RMD160 db11fb0079026e69072c85172963d0702ec6ece8 SHA1 c4f34454a6edfa727abbc2773820702d545584c7 SHA256 a9fc05b4236ee958035ce77cc3cb6a17834506c127043a65d87a334ca785db0f
-MISC ChangeLog 4681 RMD160 fddd9bdb4f90dc8fc7b418bba5deb5621be74aaf SHA1 286fcd4c655eda93b5c14fdae10ae933bfa1eb41 SHA256 2258410210ea515d12df54f48470c23d91ac0c9f3095ad0cad2a35febad554ad
+DIST davical-0.9.9.6.tar.gz 2674176 RMD160 fe9cfbcd61c25126b84a91b8eec052926c14df45 SHA1 e9237e187afa82b669ffc20afc5bbf71a91d1afd SHA256 5b8851bf16610cd16ba28c5640a75e1bdcc5a0e75c7046aec37161f6a0e9d680
+EBUILD davical-0.9.9.6.ebuild 1812 RMD160 de104c752826a83add327934d7352f3f018d28a7 SHA1 702ac9c1bde700bc6b54255c68f609a3da4bf807 SHA256 678a5816ec40814edea66ff29e9e81d534128b70d630e076de0f0492da4bc783
+MISC ChangeLog 4912 RMD160 6c28f593f3ec64a306fb5a44070fd54e44fdfedb SHA1 e16932626fee70730329155d48aa6a146300f843 SHA256 ab28806c84fc696c4de27ce4e7ed3c5637223c80ec603900ddf949151ef61e8d
 MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/www-apps/davical/davical-0.9.9.4.ebuild b/www-apps/davical/davical-0.9.9.6.ebuild
index f482a7c70..1cf598127 100644
--- a/www-apps/davical/davical-0.9.9.4.ebuild
+++ b/www-apps/davical/davical-0.9.9.6.ebuild
@@ -21,12 +21,16 @@ RDEPEND="app-admin/pwgen
 	dev-perl/DBI
 	dev-perl/DBD-Pg
 	dev-perl/yaml
-	>=dev-php/awl-0.46
+	>=dev-php/awl-0.48
 	www-servers/apache"
 
 need_php5
 need_httpd
 
+src_prepare() {
+	epatch "${FILESDIR}/awl_location.patch"
+}
+
 src_compile() {
 	if use doc ; then
 		einfo "Generating documentation"
@@ -65,7 +69,7 @@ src_install() {
 	doins config/* "${FILESDIR}/vhost-example" \
 		|| die "newins failed"
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
 	webapp_src_install
 
 	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch
new file mode 100644
index 000000000..376aae6a3
--- /dev/null
+++ b/www-apps/davical/files/awl_location.patch
@@ -0,0 +1,21 @@
+--- scripts/po/rebuild-translations.sh.orig	2011-09-29 21:23:48.122625252 +0200
++++ scripts/po/rebuild-translations.sh	2011-09-29 21:49:55.642929743 +0200
+@@ -10,7 +10,7 @@
+ PODIR="po"
+ LOCALEDIR="locale"
+ APPLICATION="davical"
+-AWL_LOCATION="../awl"
++AWL_LOCATION="/usr/share/php5/awl"
+ 
+ if [ ! -d "${AWL_LOCATION}" ]; then
+   AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
+@@ -25,7 +25,8 @@
+ 
+ egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
+ sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
+-sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
++sed "s:/awl/inc/:/awl/:" ${PODIR}/pofilelist.tmp1 >> ${PODIR}/pofilelist.tmp2
++sort ${PODIR}/pofilelist.tmp2 | uniq > ${PODIR}/pofilelist.tmp
+ xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp
+ sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot
+ rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1
diff --git a/www-apps/davical/files/postinstall-en-0.9.9.4.txt b/www-apps/davical/files/postinstall-en.txt
index 004cc0346..7565fbffd 100644
--- a/www-apps/davical/files/postinstall-en-0.9.9.4.txt
+++ b/www-apps/davical/files/postinstall-en.txt
@@ -11,6 +11,8 @@ upgrade the database structure with
 	cd /usr/share/webapps/davical/${PVR}/sqlscripts/
 	./update-davical-database -dbuser xxxxxxx -appuser xxxxxx
 
+You can safely ignore any message about missing time_zone table.
+
 If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/
 have been moved away from the htdocs directory and placed into hostroot for
 safety reasons. Update you include_path accordingly.