gentoo resync : 15.12.2019

4 files changed, 2 insertions, 116 deletions

diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index e7f8cfe016fa..f481f767e7c0 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,9 +1,6 @@
-AUX davical-1.1.7-fix_php4_style_constructors.patch 1364 BLAKE2B 4e4217fcb0a096f6020f0fb35eb800f52e349b8b4a4540ce19d7395d924926d8bda4f3c835311b95f2f2f3719289c71873b69d60d950254f37c82cb7e04e29c3 SHA512 3d971649f4fabf40b6683917d111f4cd374d6f01b98ffb8502030ff63e3b36e667a969c67e457f415a053b546e0362b128f1632e668f7eb2421832b86bf3cb75
 AUX postinstall-en.txt 201 BLAKE2B 4e4ff030cb8031785d62b17e83b7bb2e40124466081b407e7638cb41a9045cb478f8e71a2122005668047620a7fff644a0ae069b924709139ac6d87edf527e57 SHA512 a35c6e0700a047d39f5f685c5ef9453a430cc871f3c965b859dfbd9564953e2cb7ae6dabe59e4efe23fbbd971500c20c1d7174398d9e8e66cdc4d3ccc03ac988
 AUX postupgrade-en.txt 218 BLAKE2B 83d752f4a76637ac90d65b7c458c7dadb44a2d5ba496419ce71c9763793abbd95b97b0ead133fe7afd1b2b4b382dc00149d9b6135fa2430300281741ed2a8d34 SHA512 0154d820ed27e43f091d535550dc61fdb91faaf303926cd3a2ba16300b963d0ea5226015fc546cb6419c9df82ab7e99f0f05287b4a5240c2ea381a43ec8e52d3
 AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d59390931327ebcfdc338a515a8f7d9cfc5a6f071e0266fa82f0b6b3b4bab97979ff4dd8231fa2d729 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9
-DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455
-DIST davical-1.1.8.tar.xz 1358060 BLAKE2B 9b38081981e876bfdb025bfb5cbd57843645e399df0816658c395ab8c2447809930596a4adcc7bb30f357435735a435c75b03431505eec24fd5adb270845fc39 SHA512 e4a81a80086cdb67af47202865ad1652e83f276d2b82fc80b8bff60682027c911f2000052b1f32008269c77147462ec21886eae78fb3b5d4247b747fb9c4d1e6
-EBUILD davical-1.1.7-r2.ebuild 1721 BLAKE2B 1aad5ac42f137afec064ec6bcfe808e6eebbf7c027f9d092dda86839fa6b0cd36581df8e7f1e57f5fba8917055d5ae2b2ee6500ac6925ebc866c8ca05a89bff3 SHA512 b0435f9dbf3817ae638027b14e17ce00187404cf1cabf61ff74a78d51d362cad0f0d42e7ed1d18e6e61e4964affc58f55481909549641f16d580a43c77485bac
-EBUILD davical-1.1.8.ebuild 1655 BLAKE2B f21b19a458a1035ca9bf1d872753f5c81aea66454e71bd0820232d107f6b387757eefc831df265087bcd500af72bd163af301d54fb686996e44d91593df88efe SHA512 bc71b908e4abc9aee0a3155fd62d9355ff71586bb4012d077c276b0f46cfb4da96462858f735ec4f2e5855adfed2b455f0687327e27775b41e372d7c67989c09
+DIST davical-1.1.9.2.tar.xz 1359636 BLAKE2B 6161e98dc4683310ec51ca1272f4869dd56711f6bd2f3aadf4481c847056c060a7d2811368587aea42377ff27ccdbaf0095d4fd915aec7c5b766fd7e073d25ef SHA512 025f6600fde809ef95708197e62523b400e06a187461221a4fa86326ebef2452857b1d433c25b0b50ee56df89040aec733fc597d8f966ab22720a8ce38a0f5b2
+EBUILD davical-1.1.9.2.ebuild 1655 BLAKE2B f21b19a458a1035ca9bf1d872753f5c81aea66454e71bd0820232d107f6b387757eefc831df265087bcd500af72bd163af301d54fb686996e44d91593df88efe SHA512 bc71b908e4abc9aee0a3155fd62d9355ff71586bb4012d077c276b0f46cfb4da96462858f735ec4f2e5855adfed2b455f0687327e27775b41e372d7c67989c09
 MISC metadata.xml 464 BLAKE2B f84e3f2c3b622eea5925ed066e9885aa1adb55d2f62245da5a63118bd99b30e36c10f21cd001da54a35926489860ee92cbde495552a52faf2f70dfd87807035d SHA512 74382454cf5fad3dc417c8c5be290919a3e86fae9f7508eadc995a0253e18350f1ef8ba9b0085f174e7fb15b14b5cd5630180dcbc2178132409d858182c31b84
diff --git a/www-apps/davical/davical-1.1.7-r2.ebuild b/www-apps/davical/davical-1.1.7-r2.ebuild
deleted file mode 100644
index 9d2ef12cb2f7..000000000000
--- a/www-apps/davical/davical-1.1.7-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="A CalDAV and CardDAV Server"
-HOMEPAGE="https://www.davical.org/"
-SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
-
-BDEPEND="sys-devel/gettext"
-
-RDEPEND="app-admin/pwgen
-	dev-lang/php:*[calendar,curl,iconv,imap,ldap?,nls,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_postupgrade_txt en "${FILESDIR}/postupgrade-en.txt"
-	webapp_src_install
-
-	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
-	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
-}
-
-pkg_postinst() {
-	elog "If you are upgrading from a previous version of davical, don't forget to"
-	elog "upgrade the database structure with"
-	elog "       cd /usr/share/webapps/davical/${PVR}/sqlscripts/"
-	elog "       ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx"
-
-	webapp_pkg_postinst
-}
diff --git a/www-apps/davical/davical-1.1.8.ebuild b/www-apps/davical/davical-1.1.9.2.ebuild
index b7cc044e06db..b7cc044e06db 100644
--- a/www-apps/davical/davical-1.1.8.ebuild
+++ b/www-apps/davical/davical-1.1.9.2.ebuild
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
deleted file mode 100644
index a236e2823373..000000000000
--- a/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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;