From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1060732-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D1921138334
for <garchives@archives.gentoo.org>; Thu, 6 Dec 2018 01:07:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C4F38E089C;
Thu, 6 Dec 2018 01:07:40 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7FFF7E089C
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Dec 2018 01:07:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5D3EB335CC0
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Dec 2018 01:07:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A330445
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Dec 2018 01:07:36 +0000 (UTC)
From: "Virgil Dupras" <vdupras@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" <vdupras@gentoo.org>
Message-ID: <1544058362.71c1797a48ef1d612091642a18e6b9cafe60346f.vdupras@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/davical/, www-apps/davical/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-apps/davical/davical-1.1.7-r1.ebuild www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch
X-VCS-Directories: www-apps/davical/ www-apps/davical/files/
X-VCS-Committer: vdupras
X-VCS-Committer-Name: Virgil Dupras
X-VCS-Revision: 71c1797a48ef1d612091642a18e6b9cafe60346f
X-VCS-Branch: master
Date: Thu, 6 Dec 2018 01:07:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 87e8168a-229b-4a9c-8ed4-a27a75db34ef
X-Archives-Hash: af892c9423100c170ee1e64512da3451
commit: 71c1797a48ef1d612091642a18e6b9cafe60346f
Author: Till Schäfer <till2.schaefer <AT> uni-dortmund <DOT> de>
AuthorDate: Wed Nov 28 17:40:06 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Thu Dec 6 01:06:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c1797a
www-apps/davical: fix php4 style constructors
Closes: https://bugs.gentoo.org/650926
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Till Schäfer <till2.schaefer <AT> uni-dortmund.de>
Closes: https://github.com/gentoo/gentoo/pull/10513
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
www-apps/davical/davical-1.1.7-r1.ebuild | 61 ++++++++++++++++++++++
...davical-1.1.7-fix_php4_style_constructors.patch | 39 ++++++++++++++
2 files changed, 100 insertions(+)
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 00000000000..305023b842f
--- /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/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 00000000000..a236e282337
--- /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;