4 files changed, 105 insertions, 3 deletions
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index cee00f1ee66a..b61f5c7b4477 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,5 +1,7 @@
+AUX davical-1.1.7-fix_php4_style_constructors.patch 1364 BLAKE2B 4e4217fcb0a096f6020f0fb35eb800f52e349b8b4a4540ce19d7395d924926d8bda4f3c835311b95f2f2f3719289c71873b69d60d950254f37c82cb7e04e29c3 SHA512 3d971649f4fabf40b6683917d111f4cd374d6f01b98ffb8502030ff63e3b36e667a969c67e457f415a053b546e0362b128f1632e668f7eb2421832b86bf3cb75
 AUX postinstall-en.txt 730 BLAKE2B 43e38a6c099ffd1abf70a066fd0c4a7e88829ddc03bd8804eef1843158210a20a3030b4193ce89d969a88d8be4373e0d22ccb5a9984ec8cacfd9bedccf29d958 SHA512 e77199c7978bf44f96b82dee6d7cf22e4a964f2bd48c17890add7ec0742a5f4c3a296bcb813f6ac79059e8b98b5c155a0846b00c3622ea708f6baf3895270de4
 AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d59390931327ebcfdc338a515a8f7d9cfc5a6f071e0266fa82f0b6b3b4bab97979ff4dd8231fa2d729 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9
 DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455
-EBUILD davical-1.1.7.ebuild 1274 BLAKE2B f7719fbe99311187884aeaf65a760d86135e8f9176ec2cdf84d34db5c7f4681f39c6344cb161306ab8ebbaeb711ae72a135c15d43def684e56c8c6f0a2a3fdc2 SHA512 c69d4fe244d216c7a028862b0eaaafa275e27cc0f17370ab3efcce0599b176e9ee5460fc10f76e39fdfe5076545c76e6b05314fcdb0bd122a782a78babf2ba50
+EBUILD davical-1.1.7-r1.ebuild 1307 BLAKE2B a9cbc71f0586e2f0614077dfe711d8e73412f6a10abe643cfc9f3cf4883fbddc0a36f65021eff65b5723472ea59ea5f91be89cf08249908bc8f6f8743194383f SHA512 0eba7bcf05036cc95d55c5691a35ef22d626a82b7f2c4306ab745fde925596702b405922122e2bee553f51f6641f202c010f93fae451c9425ae2ad24b03b4556
+EBUILD davical-1.1.7.ebuild 1272 BLAKE2B 79c7b8181f50611ceb51ddbc0da6fa55a827ea2de44eb78ffcd7abb73132979b4699b659c987307e42b6baee07dbe148b5cb8d490d5fc31235d06a5eb9fd9e2e SHA512 301de270a523525ad93399b68ce892cb382e69d8d6c4b84d15915d1840760756ad6c8d0266dd67627d983d6016566cece93d375b82459d611547b4719f82bbc5
 MISC metadata.xml 464 BLAKE2B f84e3f2c3b622eea5925ed066e9885aa1adb55d2f62245da5a63118bd99b30e36c10f21cd001da54a35926489860ee92cbde495552a52faf2f70dfd87807035d SHA512 74382454cf5fad3dc417c8c5be290919a3e86fae9f7508eadc995a0253e18350f1ef8ba9b0085f174e7fb15b14b5cd5630180dcbc2178132409d858182c31b84
diff --git a/www-apps/davical/davical-1.1.7-r1.ebuild b/www-apps/davical/davical-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..b3bad2197f85
--- /dev/null
+++ b/www-apps/davical/davical-1.1.7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="https://davical.org/"
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-php/awl-0.59
+	sys-devel/gettext"
+RDEPEND="app-admin/pwgen
+	dev-lang/php:*[calendar,curl,pdo,postgres,xml]
+	dev-perl/DBD-Pg
+	dev-perl/DBI
+	dev-perl/YAML
+	>=dev-php/awl-0.59
+	virtual/httpd-php"
+
+need_httpd
+
+PATCHES=( "${FILESDIR}/${P}-fix_php4_style_constructors.patch" )
+
+S="${WORKDIR}"
+
+src_compile() {
+	emake built-locale
+}
+
+src_install() {
+	webapp_src_preinst
+
+	einstalldocs
+
+	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 "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/.
+
+	insinto /etc/${PN}
+	doins -r 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/davical-1.1.7.ebuild b/www-apps/davical/davical-1.1.7.ebuild
index f247e7e3b458..1f459316daa3 100644
--- a/www-apps/davical/davical-1.1.7.ebuild
+++ b/www-apps/davical/davical-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="A CalDAV and CardDAV Server"
 HOMEPAGE="https://davical.org/"
 SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=dev-php/awl-0.59
diff --git a/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch b/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch
new file mode 100644
index 000000000000..a236e2823373
--- /dev/null
+++ b/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch
@@ -0,0 +1,39 @@
+diff --git a/inc/HTTPAuthSession.php b/inc/HTTPAuthSession.php
+index e3b208c6..08663286 100644
+--- a/inc/HTTPAuthSession.php
++++ b/inc/HTTPAuthSession.php
+@@ -60,7 +60,7 @@ class HTTPAuthSession {
+   /**
+   * The constructor, which just calls the type supplied or configured
+   */
+-  function HTTPAuthSession() {
++  function __construct() {
+     global $c;
+ 
+     if ( ! empty($_SERVER['PHP_AUTH_DIGEST'])) {
+diff --git a/inc/PublicSession.php b/inc/PublicSession.php
+index 28e06173..e779a9df 100644
+--- a/inc/PublicSession.php
++++ b/inc/PublicSession.php
+@@ -59,7 +59,7 @@ class PublicSession {
+   /**
+   * The constructor, which just calls the actual type configured
+   */
+-  function PublicSession() {
++  function __construct() {
+     global $c;
+ 
+     $principal = new Principal('username','unauthenticated');
+diff --git a/inc/caldav-client.php b/inc/caldav-client.php
+index 4c1bf67f..b32c5c91 100644
+--- a/inc/caldav-client.php
++++ b/inc/caldav-client.php
+@@ -48,7 +48,7 @@ class CalDAVClient {
+   * @param string $pass      The password for that user
+   * @param string $calendar  The name of the calendar (not currently used)
+   */
+-  function CalDAVClient( $base_url, $user, $pass, $calendar = '' ) {
++  function __construct( $base_url, $user, $pass, $calendar = '' ) {
+     $this->user = $user;
+     $this->pass = $pass;
+     $this->calendar = $calendar;