Version bump fixes bug 523138. New patch fixes bug 481528. Somewhere along

the way bug 506558 was fixe.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

4 files changed, 190 insertions, 11 deletions

diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
index 86fb3747fe6d..1cb0dcf60817 100644
--- a/www-apps/davical/ChangeLog
+++ b/www-apps/davical/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/davical
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/ChangeLog,v 1.6 2013/10/21 17:15:00 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/ChangeLog,v 1.7 2014/11/14 19:29:54 titanofold Exp $
+
+*davical-1.1.3.1 (14 Nov 2014)
+
+  14 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  +davical-1.1.3.1.ebuild, +files/awl-locations.patch:
+  Version bump fixes bug 523138. New patch fixes bug 481528. Somewhere along
+  the way bug 506558 was fixed.
 
   21 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Removed François from metadata.xml per his request.
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 2dd7b4a4bc16..10860c878aaf 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX awl-locations.patch 2303 SHA256 8ec4c20da78172272718dd47ca95a673b98d679c8aa809abb5d6f8a28c7cc3e1 SHA512 38aca5e25ee3fa7c9d06ec9bb027a28ac175535657be1eb7dc160c95101588a182a1907109b4d4969b3e136a72e142a5b6a0d1734b5a7418a2418ba2f9ce3f5f WHIRLPOOL 55bc8a612cfede94a837a985b905f581b3e3a8f8df40fd588a721b3f4c06d1a8b45d7f7665686f76e2bcf82c7106ad089e615736b25febcf6aad81e68181cf18
 AUX awl_location.patch 1156 SHA256 67a0bc37c10a2468919e647953766b8121009c0f3d0eb17c08580987300a0219 SHA512 89a4599d4ef417cba923c2a5f35bbf0b3f6618d8beb344a2ae0ff42c564be2e040ed336f1d8bd8013eda48e77233cb25846d59716b486f441d78fc0d75739f44 WHIRLPOOL c96d02b2074ae5547ee8dc4a6ee8e8b12fef64b9d7949c1ff02f8551834037df58ee6eba40a2e011cfc2ac3f52e83a848cbb7b621ad527be6dfafaf0d278b10c
 AUX inc_path.patch 1418 SHA256 b0f4544639ce76b3cdcd032854bb94178580e12dd51cb9d8d5d6a1f29747a138 SHA512 f5f4019322627d32a1fa34251bc5cb5788103ff8048c11c000f034db3118154dd193fd510721cc664e6c492c23331fa2c13dbcddd00c00197dec9d63c4196fd3 WHIRLPOOL cf77f8a9f16b45a2e72c4589ccb1be65a387bab18d8a370c7b0efed289e462960cbf4db5348766e8ff632ceef3d97d1bdeb059e09224dbd87e03a0b8f721840b
 AUX postinstall-en.txt 730 SHA256 a8796e92aace5307fa6911a3019cd2f1f4baefb5bd4b90efedda5793967ceed1 SHA512 e77199c7978bf44f96b82dee6d7cf22e4a964f2bd48c17890add7ec0742a5f4c3a296bcb813f6ac79059e8b98b5c155a0846b00c3622ea708f6baf3895270de4 WHIRLPOOL 9c87177121fb9929201754ea84ba2a435c2b388a796473a35440f09c7f1b6c033f230423ecbb8acf9fdd8c2b9717acf9d2f72b2bcce136fb27d619f5f79d1a48
@@ -8,20 +9,18 @@ AUX vhost-example 366 SHA256 3d1609ff3652814c00aeb33effdfca48a60698b8b5da4db7f97
 DIST davical-1.0.2.tar.gz 2739740 SHA256 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6
 DIST davical-1.1.0.tar.gz 2967572 SHA256 cc52f09c1f8706aa2b6d598b77ef0997b6e7ee31db1f1325864d705514505816 SHA512 5c272418b5c324d0ea4cbdd9c1124171ecd1fe1f3df4953569b02a47359469539205ff48e92aa19abaa667bb7c69f1b8b8196d79e549645009ac0b7bbddd7c18 WHIRLPOOL e224f62c4143d5c92387a346ec1ff14504b7892308d302a3f50d749725c58b8edbc23642640cd29b85e4095b4e3352242ccc25657cd4193f13e191a0ac894a24
 DIST davical-1.1.1.tar.gz 2979425 SHA256 09bd92a35d2730fe687f6801796d8da1090cb8e36c2910c056a01b00cb73cafc SHA512 6f0b2a13ba6698ea1a7d16988c795888820a08d125ac3d622b6c9fc21f831b698e8ce2c9c7ae25e64252f38502e473daabbd0626c5b2450646efb7cdb7f5b31e WHIRLPOOL 82e1a3530dd2247d46effd2df13554d3af2f2141d3c5efb7eb3cc1d514f8defc7a479ff47d135872ef712ae63d6a39ba4d65df14c2885ab2ca7b6510e6db23bf
+DIST davical-1.1.3.1.tar.gz 3031220 SHA256 4439c2df0052241b65c61eb4f0b10c406d93afd65a5cc6b523b597c0a7b05c15 SHA512 1944c4750799e9388adcaf1d5df6a2a5daccc34dd7274673a6b27cf0c32b2357d3cdd6d7c0928ea182408ce5111530f6b0e2eb6d882eb47ee1dcfa6eb8d4fe4b WHIRLPOOL d32252bef2c5f4d772a7d0744d8d6aaabbde2de2f3e259802c80242e5f87ecf5ed4ea965daa2c5ec134c214c46bbbfc1e234fcdbb23f507f6de1ed328d9f6934
 EBUILD davical-1.0.2-r1.ebuild 1932 SHA256 27cab00332541242be435289c2a7c48c1e1440040f0c7879644de42698af5f9a SHA512 96df7de2bd55fee680240b0eb12c0c116772703a203b7e48e80e888eb704372d42ad50f7dc2905caad7fb2d09bb175e8a70e17f84e3cb9f1eefd1cb95ba8670c WHIRLPOOL ca3930ae94af5ff5c82fa8480bfd06183976a6a69103e67b297c9b2a0be535e59988d8770c8a9b081f1763cd0e8f7c5f55113e643798efd48a0cd06243a4c98a
 EBUILD davical-1.1.0.ebuild 1929 SHA256 f6990a16b38e05170c68a2638c58e6c8cbfb770a911e0bc366629c772da8d2b4 SHA512 a75dfb91c2b9cca45a662248cc7d619f3eb93437a04151c039117286f295a8612ae6ead3b243337b43c5bbdb1eae83f6ddc18bcdd95539a0795d5ada8f180164 WHIRLPOOL f1958772d093e55dc0811e2c6821a25388a808bc614932cbe157ce4c8c7096303ce81c3fd3021a3758c86e0e94a1b2db6a780a37b67f554d6a8af2704ffa022b
 EBUILD davical-1.1.1-r1.ebuild 1931 SHA256 0f0367c4e7556218775c35dfad1fa2ff161831c2902958b76a42e4b56a5073d6 SHA512 c527db34f527fea0ec4b9391206921a549786e16f8dd30bb76e45bbf9e13c3d2354ab91e3212e8a057f2402ffa4a0cbad25cbb7b48b4cc40e39e19a073768eeb WHIRLPOOL afdfe571b2b95e1cf6d78b314d07ef17045859e78cd5f3a7f03cdc5ce387c1a682f0b4b23689449ad112dd61c709f2e6ffda8ed1d484e5beab668237ee179db8
 EBUILD davical-1.1.1.ebuild 1929 SHA256 7e40fd51f11dee0fc5fcab6a3df20c586de9890f85f8a5fa29f580f6322151f6 SHA512 29516e9304c44195a442f485f266366b1ed642b2218641564e8a9786dd87628c194e413ac3b8a5d11cf7c4accb1d630e6b694efa3314f65c85c12d6578eda59e WHIRLPOOL 3536d244d7672817e059946b4d0ab59a16160328a32e822f93e53c54a0f82744df504a7add5827074acae49ead19d2f64baaf6e84ab1a86bdd82b9fd1d139768
-MISC ChangeLog 6368 SHA256 732ec43f0cc29147c0ae9f6de316f02bd5d8cd7b7f28862a3f9daf6449d24e33 SHA512 4805c48487f65316c581be0d7fa27319ab129a31f0999d18ff9fc7cc24380542521be5ea52dd5c6ef51c0a2bba06fe39c2b9c2d37102b58799bb7b6fd50a5ee0 WHIRLPOOL 0343c014be954b462be552f9e9dd1fd789da946886d07d8b89543ef64f78ec829f5f4c54f90732b966f7583a48fdcd64749b1e1032206f76712fc71c9e5159b4
+EBUILD davical-1.1.3.1.ebuild 1875 SHA256 08c37669ff89e1f2415cfbe4514ee36a20b3cee7dd6b8919dda8b411a5ac9cc2 SHA512 4e3cbd1c83a2dbad860d404ed8e1a7b9a2dda43c260ee1bf14fbab4aa842b570492ba64698234df54fec6ca9552e60e65cbca4c1d0166e6fa0721a724e6cd8db WHIRLPOOL 91c39674a5f0e9d3fe9a616e6ea22f160180be9f48dba2ed2108c9deee3150b63cbfdae493a006912dd01323e057a825748307e4bd7f03368b9447c48c370931
+MISC ChangeLog 6625 SHA256 0cb65720c95c76cf7c10b54355373ccd8afa689fdd9ae336b72ddc201e9fcaca SHA512 f3eb2192ac531c8f7cd116a2c1f6de9b8a2017231dcfde136abb72a70e9648df1406eba990c5989049fe097a5317fc271ce27b4a441e3ce063e15b3574ef4488 WHIRLPOOL 96f4a44675aff46579a6ff7e10a695f1a0573edb67630656daafd1565caa9436a8d74b97c95523460cb4a50bb3012d6aeb254ea7c5b3ec2c17234566a05edf04
 MISC metadata.xml 275 SHA256 780dae37784989c8c166e00f8a13a1b256c67feb87657016b93db3cec4e755a8 SHA512 c69320f94e1ceecb9199120795acf4ffddb6e972a63f53db1d6dca49449b5f1734b320dbea6fc097edceabc5fed17cf18cef6a917451cbe5e447dd87f8ac3e6e WHIRLPOOL fe8c08375133fe403a057b4499e2c988bfb517193263edfe351abb33ede09cd30a16008cc968886c814230ca61baac2cbbae4e0efbd308f7d0f6abe66590f1be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJSZWEMAAoJEJWyH81tNOV9e6IH/1MWWhvFw+JFBpRA26SnOO0h
-xhAkNrMOFdrIs5ymL1PAZEPl3rUiAZfi+8tXbPaD369zwB2K6J/Sh7UlHjCpN/8y
-FEhb9WWczduq9FdQMfA9edzQEPzG0EedJ2Kl3rfpMBPIw7/yunHqyaLQodtGjdXu
-p1CjGnR8jGemISsbQeGCCssg4lgLsep7WQoIzCAIFeFB1IGPlnM2+QFcWo04cicm
-4M7++a0pl4M+3uGWBTQW0QYcUW6gGYOzw8HzqGlMuAniOa0NP+V++ZUxDXvJsntR
-Qms7M1/3FAZGogBbVYolj0GY8kapT1ElTkc/SCIc4BHUkOkHEN3CFpS6Zz8S3Ko=
-=yxKs
+iF4EAREIAAYFAlRmWDgACgkQVxOqA9G7/aDADwD/S87ywvQKyR0R4DH+MTGk2JaR
+0Sr2vkLWHOxJkjUOZPQA/3sPmYv6tdlj6ybh0hgm2qSL8fAxogzF31FaGZs9hhB8
+=dTpB
 -----END PGP SIGNATURE-----
diff --git a/www-apps/davical/davical-1.1.3.1.ebuild b/www-apps/davical/davical-1.1.3.1.ebuild
new file mode 100644
index 000000000000..2e8f56552d79
--- /dev/null
+++ b/www-apps/davical/davical-1.1.3.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.1.3.1.ebuild,v 1.1 2014/11/14 19:29:54 titanofold Exp $
+
+EAPI=5
+
+inherit depend.php webapp
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="http://davical.org/"
+SRC_URI="https://gitlab.com/${PN}-project/${PN}/repository/archive.tar.gz?ref=r${PV} -> ${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-admin/pwgen
+	dev-lang/php[calendar,curl,pdo,postgres,xml]
+	dev-perl/DBI
+	dev-perl/DBD-Pg
+	dev-perl/yaml
+	>=dev-php/awl-0.51
+	virtual/httpd-php"
+DEPEND="${RDEPEND}
+doc? ( dev-php/PEAR-PhpDocumentor )"
+
+S="${WORKDIR}/${PN}.git"
+
+need_php5
+need_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/awl-locations.patch"
+	epatch "${FILESDIR}/inc_path.patch"
+}
+
+src_compile() {
+	emake built-po
+
+	if use doc ; then
+		einfo "Generating documentation"
+		phpdoc -q -c "docs/api/phpdoc.ini"\
+			|| die "Documentation failed to build"
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc-php INSTALL README debian/README.Debian \
+		testing/README.regression_tests TODO debian/changelog \
+		|| die "dodoc failed"
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* htdocs/.htaccess
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale
+	rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/*
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r docs/api/ docs/website/
+	fi
+
+	insinto /etc/${PN}
+	doins config/* "${FILESDIR}/vhost-example"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
+	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
+}
diff --git a/www-apps/davical/files/awl-locations.patch b/www-apps/davical/files/awl-locations.patch
new file mode 100644
index 000000000000..e0105bffbd2f
--- /dev/null
+++ b/www-apps/davical/files/awl-locations.patch
@@ -0,0 +1,93 @@
+diff --git a/dba/create-database.sh b/dba/create-database.sh
+index b1dd1fa..d25f9d9 100755
+--- a/dba/create-database.sh
++++ b/dba/create-database.sh
+@@ -10,22 +10,29 @@ DBADIR="`dirname \"$0\"`"
+ 
+ INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXXXX`"
+ 
+-testawldir() {
+-  [ -f "${1}/dba/awl-tables.sql" ]
+-}
+ 
+-#
+-# Attempt to locate the AWL directory
+-AWLDIR="${DBADIR}/../../awl"
+-if ! testawldir "${AWLDIR}"; then
+-  AWLDIR="/usr/share/awl"
+-  if ! testawldir "${AWLDIR}"; then
+-    AWLDIR="/usr/local/share/awl"
+-    if ! testawldir "${AWLDIR}"; then
+-      echo "Unable to find AWL libraries"
+-      exit 1
++# Candidate locations of the AWL directory
++awldirs="${DBADIR}/../../awl
++/usr/share/awl
++/usr/share/php/awl
++/usr/local/share/awl"
++
++# Disable globbing and use newline as seperator
++set -f; IFS='
++'
++for d in $awldirs ; do
++    if [ -f "${d}/dba/awl-tables.sql" ] ; then
++	AWLDIR="${d}"
++	break
+     fi
+-  fi
++done
++
++# Renable file globbing and reset seperator 
++set +f; unset IFS
++
++if [ -z "${AWLDIR}" ] ; then
++    echo "Unable to find AWL libraries"
++    exit 1
+ fi
+ 
+ export AWL_DBAUSER=davical_dba
+diff --git a/scripts/po/rebuild-translations.sh b/scripts/po/rebuild-translations.sh
+index 7191615..809fa8c 100755
+--- a/scripts/po/rebuild-translations.sh
++++ b/scripts/po/rebuild-translations.sh
+@@ -10,17 +10,30 @@
+ PODIR="po"
+ LOCALEDIR="locale"
+ APPLICATION="davical"
+-AWL_LOCATION="../awl"
+-
+-if [ ! -d "${AWL_LOCATION}" ]; then
+-  AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
+-  if [ ! -d "${AWL_LOCATION}" ]; then
+-    AWL_LOCATION=/usr/share/awl
+-    if [ ! -d "${AWL_LOCATION}" ]; then
+-      echo "I can't find a location for the AWL libraries and I need those strings too"
+-      exit 1
++
++awldirs="../awl
++`find .. -type d -name 'awl-*.*'`
++/usr/share/awl
++/usr/share/php/awl
++/usr/local/share/awl"
++
++# Disable globbing and use newline as seperator
++set -f; IFS='
++'
++
++for d in $awldirs ; do
++    if [ -d "${d}" ] ; then
++	AWL_LOCATION="${d}"
++	break
+     fi
+-  fi
++done
++
++# Renable file globbing and reset seperator 
++set +f; unset IFS
++
++if [ -z "${AWL_LOCATION}" ] ; then
++    echo "I can't find a location for the AWL libraries and I need those strings too"
++    exit 1
+ fi
+ 
+ egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1