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

the way bug 506558 was fixe.

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)

3 files changed, 182 insertions, 2 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/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