public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-apps/davical/, www-apps/davical/files/
@ 2018-04-27  9:40 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2018-04-27  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     7ee14b4b13114bd009f46551bf644a104f69cfb3
Author:     Till Schäfer <till2.schaefer <AT> uni-dortmund <DOT> de>
AuthorDate: Wed Apr 25 15:02:37 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 09:40:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee14b4b

www-apps/davical: use official release tarball

drop outdated versions

Closes: https://bugs.gentoo.org/653988

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-apps/davical/Manifest                  |  6 +-
 www-apps/davical/davical-1.0.2-r2.ebuild   | 70 ----------------------
 www-apps/davical/davical-1.1.0-r1.ebuild   | 71 -----------------------
 www-apps/davical/davical-1.1.1-r2.ebuild   | 69 ----------------------
 www-apps/davical/davical-1.1.3.1-r2.ebuild | 71 -----------------------
 www-apps/davical/davical-1.1.7.ebuild      |  8 ++-
 www-apps/davical/files/awl-locations.patch | 93 ------------------------------
 www-apps/davical/files/awl_location.patch  | 21 -------
 www-apps/davical/files/inc_path.patch      | 28 ---------
 9 files changed, 6 insertions(+), 431 deletions(-)

diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index bc9270c1403..5e6249b3a8e 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,5 +1 @@
-DIST davical-1.0.2.tar.gz 2739740 BLAKE2B 1f8c117d52d577a4364407e35552ca59aeaaea812e0cff76525a65cbfc70ab2e235f1dc38198c16a5cc7869a3592923a72821cff1dd737b85238fbe10629a5d2 SHA512 8eb1df963b0e3aa87c28e75001c4301698abff74fd4581bdc826bfad8d8e1cd5aa0b641c668dbecc2f85ca8f3bca8ec9a508d268881da004cbb84017c2604dcb
-DIST davical-1.1.0.tar.gz 2967572 BLAKE2B e36f5d20323996f48173c3cde32d4b8600dd019fb13f649edc053588679bea5b1753df70db4997277db251a8ef862cece9a32e230c48929cb8728109de3cb3cd SHA512 5c272418b5c324d0ea4cbdd9c1124171ecd1fe1f3df4953569b02a47359469539205ff48e92aa19abaa667bb7c69f1b8b8196d79e549645009ac0b7bbddd7c18
-DIST davical-1.1.1.tar.gz 2979425 BLAKE2B 06dd2bda2459b113c94d19128979da2ed6fc06442591812116afd69aee94ab7ac2ebb31b58afe2d4335f8e49bb1f52d2fcfac7a8a31b6643f11143c4ef61521b SHA512 6f0b2a13ba6698ea1a7d16988c795888820a08d125ac3d622b6c9fc21f831b698e8ce2c9c7ae25e64252f38502e473daabbd0626c5b2450646efb7cdb7f5b31e
-DIST davical-1.1.3.1.tar.gz 3031220 BLAKE2B 1a4bd7d2c027647095e76033f6689c31da3626a8862a8ab80287e48879c41348fc8dd18a59a2e8e02bf1ceb1d0c7ae8ae5ffce6cb720051a145048f0fb3903e5 SHA512 1944c4750799e9388adcaf1d5df6a2a5daccc34dd7274673a6b27cf0c32b2357d3cdd6d7c0928ea182408ce5111530f6b0e2eb6d882eb47ee1dcfa6eb8d4fe4b
-DIST davical-1.1.7.tar.gz 1818904 BLAKE2B ce6ffca5786963e2363832d994380f066812d2cd49c729270dcd92b98214c9a5be7b20ff678947ae7b300c39bdc31c5adb39cbb3d54c0bad4109809947b65811 SHA512 2bec19a85da5d626dcabc47c0c3a76e435d42a26da3e3a747a072c79a4dd955c012864580ad7ecd17b6c901acbebd77d17be9c74cef8ca19b12cba4b442c1d70
+DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455

diff --git a/www-apps/davical/davical-1.0.2-r2.ebuild b/www-apps/davical/davical-1.0.2-r2.ebuild
deleted file mode 100644
index 2705cea8265..00000000000
--- a/www-apps/davical/davical-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils
-
-DESCRIPTION="A CalDAV and CardDAV Server"
-HOMEPAGE="http://davical.org/"
-SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-php/awl-0.51
-	sys-devel/gettext"
-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
-	www-servers/apache"
-
-need_httpd
-
-src_prepare() {
-	epatch "${FILESDIR}/awl_location.patch"
-	epatch "${FILESDIR}/inc_path.patch"
-}
-
-src_compile() {
-	emake built-po
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc INSTALL README debian/README.Debian \
-		testing/README.regression_tests TODO debian/changelog
-
-	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 || die "doins failed"
-	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/davical-1.1.0-r1.ebuild b/www-apps/davical/davical-1.1.0-r1.ebuild
deleted file mode 100644
index 43091254bcf..00000000000
--- a/www-apps/davical/davical-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils
-
-DESCRIPTION="A CalDAV and CardDAV Server"
-HOMEPAGE="http://davical.org/"
-SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-php/awl-0.51
-	sys-devel/gettext
-	"
-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
-	www-servers/apache"
-
-need_httpd
-
-src_prepare() {
-	epatch "${FILESDIR}/awl_location.patch"
-	epatch "${FILESDIR}/inc_path.patch"
-}
-
-src_compile() {
-	emake built-po
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc INSTALL README debian/README.Debian \
-		testing/README.regression_tests TODO debian/changelog
-
-	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/davical-1.1.1-r2.ebuild b/www-apps/davical/davical-1.1.1-r2.ebuild
deleted file mode 100644
index 0826a035786..00000000000
--- a/www-apps/davical/davical-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils
-
-DESCRIPTION="A CalDAV and CardDAV Server"
-HOMEPAGE="http://davical.org/"
-SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-php/awl-0.51
-	sys-devel/gettext"
-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"
-
-need_httpd
-
-src_prepare() {
-	epatch "${FILESDIR}/awl_location.patch"
-	epatch "${FILESDIR}/inc_path.patch"
-}
-
-src_compile() {
-	emake built-po
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc INSTALL README debian/README.Debian \
-		testing/README.regression_tests TODO debian/changelog
-
-	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/davical-1.1.3.1-r2.ebuild b/www-apps/davical/davical-1.1.3.1-r2.ebuild
deleted file mode 100644
index 03ec48493ae..00000000000
--- a/www-apps/davical/davical-1.1.3.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils
-
-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"
-
-DEPEND=">=dev-php/awl-0.55
-	sys-devel/gettext"
-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.55
-	virtual/httpd-php"
-
-S="${WORKDIR}/${PN}.git"
-
-need_httpd
-
-src_prepare() {
-	epatch "${FILESDIR}/awl-locations.patch"
-	epatch "${FILESDIR}/inc_path.patch"
-}
-
-src_compile() {
-	emake built-po
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc INSTALL README debian/README.Debian \
-		testing/README.regression_tests TODO debian/changelog
-
-	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/davical-1.1.7.ebuild b/www-apps/davical/davical-1.1.7.ebuild
index fbd56f271c6..f247e7e3b45 100644
--- a/www-apps/davical/davical-1.1.7.ebuild
+++ b/www-apps/davical/davical-1.1.7.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-inherit webapp vcs-snapshot
+inherit 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"
+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"
@@ -24,6 +24,8 @@ RDEPEND="app-admin/pwgen
 
 need_httpd
 
+S="${WORKDIR}"
+
 src_compile() {
 	emake built-locale
 }

diff --git a/www-apps/davical/files/awl-locations.patch b/www-apps/davical/files/awl-locations.patch
deleted file mode 100644
index e0105bffbd2..00000000000
--- a/www-apps/davical/files/awl-locations.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-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

diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch
deleted file mode 100644
index 7eee3d8fcfb..00000000000
--- a/www-apps/davical/files/awl_location.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- scripts/po/rebuild-translations.sh.orig	2011-09-29 21:23:48.122625252 +0200
-+++ scripts/po/rebuild-translations.sh	2011-09-29 21:49:55.642929743 +0200
-@@ -10,7 +10,7 @@
- PODIR="po"
- LOCALEDIR="locale"
- APPLICATION="davical"
--AWL_LOCATION="../awl"
-+AWL_LOCATION="/usr/share/php/awl/inc"
- 
- if [ ! -d "${AWL_LOCATION}" ]; then
-   AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
-@@ -25,7 +25,8 @@
- 
- egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
- sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
--sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
-+sed "s:/awl/inc/:/awl/:" ${PODIR}/pofilelist.tmp1 >> ${PODIR}/pofilelist.tmp2
-+sort ${PODIR}/pofilelist.tmp2 | uniq > ${PODIR}/pofilelist.tmp
- xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp
- sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot
- rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1

diff --git a/www-apps/davical/files/inc_path.patch b/www-apps/davical/files/inc_path.patch
deleted file mode 100644
index 2230249df0f..00000000000
--- a/www-apps/davical/files/inc_path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- htdocs/always.php.orig	2012-01-05 21:28:16.382878446 +0100
-+++ htdocs/always.php	2012-01-05 21:30:06.828431957 +0100
-@@ -48,7 +48,7 @@
- // $c->default_locale = array('es_MX', 'es_AR', 'es', 'pt');  // An array of locales to try, or just a single locale
- // $c->local_tzid = 'Pacific/Auckland';  // Perhaps we should read from /etc/timezone - I wonder how standard that is?
- $c->default_locale = 'en';
--$c->locale_path = '../locale';
-+$c->locale_path = '../../davical/locale';
- $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']);
- $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']);
- $c->default_privileges = array('read-free-busy', 'schedule-deliver');
-@@ -80,6 +80,7 @@
-         '../../awl/inc'
-       , '/usr/share/awl/inc'        // Where it ends up on Debian
-       , '/usr/share/php/awl/inc'    // Fedora's standard for PHP libraries
-+      , '/usr/share/php5/awl/inc'   // Gentoo's standard for PHP5 libraries
-       , '/usr/local/share/awl/inc'
-   );
-   foreach( $try_paths AS $awl_include_path ) {
-@@ -95,7 +96,7 @@
- }
- 
- // Ensure that ../inc is in our included paths as early as possible
--set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
-+set_include_path( '../../davical/inc'. PATH_SEPARATOR. get_include_path());
- 
- 
- /** We actually discovered this and worked around it earlier, but we can't log it until the utilties are loaded */


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/davical/, www-apps/davical/files/
@ 2018-12-06  1:07 Virgil Dupras
  0 siblings, 0 replies; 5+ messages in thread
From: Virgil Dupras @ 2018-12-06  1:07 UTC (permalink / raw
  To: gentoo-commits

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;


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/davical/, www-apps/davical/files/
@ 2019-10-01  5:20 Joonas Niilola
  0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2019-10-01  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     13f9c7650574042d734591b91cd3134652cbe0f7
Author:     Till Schäfer <till2.schaefer <AT> uni-dortmund <DOT> de>
AuthorDate: Thu Sep 26 19:41:26 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 05:07:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f9c765

www-apps/davical: bump to 1.1.8

upgrade to EAPI 7
corrected dependencies
add proper upgrade message
add ldap use flag
fix license
backport changes to 1.1.7-r2

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Till Schäfer <till2.schaefer <AT> uni-dortmund.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/davical/Manifest                 |  1 +
 www-apps/davical/davical-1.1.7-r2.ebuild  | 72 +++++++++++++++++++++++++++++++
 www-apps/davical/davical-1.1.8.ebuild     | 70 ++++++++++++++++++++++++++++++
 www-apps/davical/files/postinstall-en.txt | 15 +------
 www-apps/davical/files/postupgrade-en.txt |  4 ++
 5 files changed, 148 insertions(+), 14 deletions(-)

diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 5e6249b3a8e..b6ad08ca438 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1 +1,2 @@
 DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455
+DIST davical-1.1.8.tar.xz 1358060 BLAKE2B 9b38081981e876bfdb025bfb5cbd57843645e399df0816658c395ab8c2447809930596a4adcc7bb30f357435735a435c75b03431505eec24fd5adb270845fc39 SHA512 e4a81a80086cdb67af47202865ad1652e83f276d2b82fc80b8bff60682027c911f2000052b1f32008269c77147462ec21886eae78fb3b5d4247b747fb9c4d1e6

diff --git a/www-apps/davical/davical-1.1.7-r2.ebuild b/www-apps/davical/davical-1.1.7-r2.ebuild
new file mode 100644
index 00000000000..9d2ef12cb2f
--- /dev/null
+++ b/www-apps/davical/davical-1.1.7-r2.ebuild
@@ -0,0 +1,72 @@
+# 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.8.ebuild
new file mode 100644
index 00000000000..b7cc044e06d
--- /dev/null
+++ b/www-apps/davical/davical-1.1.8.ebuild
@@ -0,0 +1,70 @@
+# 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.60
+	virtual/httpd-php"
+
+need_httpd
+
+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/files/postinstall-en.txt b/www-apps/davical/files/postinstall-en.txt
index 5a88a2bdf2e..9a6192c1551 100644
--- a/www-apps/davical/files/postinstall-en.txt
+++ b/www-apps/davical/files/postinstall-en.txt
@@ -2,17 +2,4 @@ You will need access to postgresql database to use davical.
 
 Read /usr/share/doc/www-apps/davical-${PVR}/INSTALL.gz for installation
 instructions.
-Release notes are available at
-http://wiki.davical.org/w/Release_Notes/${PVR}.
-Full documentation and wiki on http://davical.org
-
-If you are upgrading from a previous version of davical, don't forget to
-upgrade the database structure with
-	cd /usr/share/webapps/davical/${PVR}/sqlscripts/
-	./update-davical-database -dbuser xxxxxxx -appuser xxxxxx
-
-You can safely ignore any message about missing time_zone table.
-
-If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/
-have been moved away from the htdocs directory and placed into hostroot for
-safety reasons.
+Full documentation and wiki on http://www.davical.org

diff --git a/www-apps/davical/files/postupgrade-en.txt b/www-apps/davical/files/postupgrade-en.txt
new file mode 100644
index 00000000000..51b86e2c412
--- /dev/null
+++ b/www-apps/davical/files/postupgrade-en.txt
@@ -0,0 +1,4 @@
+If you are upgrading from a previous version of davical, don't forget to
+upgrade the database structure with
+	cd /usr/share/webapps/davical/${PVR}/sqlscripts/
+	./update-davical-database -dbuser xxxxxxx -appuser xxxxxx


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/davical/, www-apps/davical/files/
@ 2021-03-01  8:26 Joonas Niilola
  0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-03-01  8:26 UTC (permalink / raw
  To: gentoo-commits

commit:     04b1b056deb43fe70a81c54c1bb7c4feb976b1fc
Author:     Till Schäfer <till2.schaefer <AT> uni-dortmund <DOT> de>
AuthorDate: Fri Feb 26 08:39:35 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 08:25:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b1b056

www-apps/davical: support php8

add upstream patch for php8 compatibility

Bug: https://bugs.gentoo.org/764908
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Till Schäfer <till2.schaefer <AT> uni-dortmund.de>
Closes: https://github.com/gentoo/gentoo/pull/19664
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/davical/davical-1.1.9.3-r1.ebuild         | 73 ++++++++++++++++++++++
 .../files/davical-1.1.9.3-php8_compatibility.patch | 58 +++++++++++++++++
 2 files changed, 131 insertions(+)

diff --git a/www-apps/davical/davical-1.1.9.3-r1.ebuild b/www-apps/davical/davical-1.1.9.3-r1.ebuild
new file mode 100644
index 00000000000..4b2bc1b3ed4
--- /dev/null
+++ b/www-apps/davical/davical-1.1.9.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 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"
+
+# >=dev-lang/php-8:curly braces string offset access was removed (Bug 764908)
+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.61
+	virtual/httpd-php"
+
+PATCHES=( "${FILESDIR}/${P}-php8_compatibility.patch" )
+
+need_httpd
+
+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/files/davical-1.1.9.3-php8_compatibility.patch b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch
new file mode 100644
index 00000000000..de9db47ff7f
--- /dev/null
+++ b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch
@@ -0,0 +1,58 @@
+From f376be164eacf51d7354c728094e697ee2336218 Mon Sep 17 00:00:00 2001
+From: Jan Hicken <jan.hicken@posteo.de>
+Date: Sun, 31 Jan 2021 11:46:32 +0100
+Subject: [PATCH 1/2] Use brackets instead of curly braces for string offset
+ access
+
+Curly braces have been deprecated in PHP 7.4 and unsupported in PHP 8.0.
+---
+ inc/check_UTF8.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inc/check_UTF8.php b/inc/check_UTF8.php
+index e3c93dbf..62dbfc00 100644
+--- a/inc/check_UTF8.php
++++ b/inc/check_UTF8.php
+@@ -67,7 +67,7 @@ function utf8ToUnicode(&$str)
+ 
+   $len = strlen($str);
+   for($i = 0; $i < $len; $i++) {
+-    $in = ord($str{$i});
++    $in = ord($str[$i]);
+     if (0 == $mState) {
+       // When mState is zero we expect either a US-ASCII character or a
+       // multi-octet sequence.
+-- 
+GitLab
+
+
+From 6cdbfcf226f0235a00206edfd119fcc90465a2b8 Mon Sep 17 00:00:00 2001
+From: Jan Hicken <jan.hicken@posteo.de>
+Date: Sun, 31 Jan 2021 11:47:41 +0100
+Subject: [PATCH 2/2] Add default value for errcontext variable in error
+ handler function
+
+This variable is no longer passed in PHP 8.0.
+
+It cannot be removed however, because it would not be backwards
+compatible.
+---
+ htdocs/setup.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/htdocs/setup.php b/htdocs/setup.php
+index 8b13d0ad..2a82dbf3 100644
+--- a/htdocs/setup.php
++++ b/htdocs/setup.php
+@@ -13,7 +13,7 @@ function log_setup_error($errno , $errstr , $errfile , $errline) {
+   error_log('DAViCal setup.php: Informational: '.$errfile.'('.$errline.'): ['.$errno.'] '.$errstr);
+ }
+ 
+-function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext ) {
++function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext = null ) {
+   if ( $errno == 2 ) {
+     // A working installation will regularly fail to include_once() for several files as it searches for the location
+     log_setup_error($errno , $errstr , $errfile , $errline);
+-- 
+GitLab
+


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/davical/, www-apps/davical/files/
@ 2023-07-27 20:01 Michael Orlitzky
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Orlitzky @ 2023-07-27 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     fbca1524f7862e080fd237583352af0686dc30ac
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 19:56:09 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 19:56:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbca1524

www-apps/davical: drop 1.1.9.3, 1.1.9.3-r1, 1.1.10

Need to get rid of some old versions before masking php-7.4.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 www-apps/davical/Manifest                          |  2 -
 www-apps/davical/davical-1.1.10.ebuild             | 72 ---------------------
 www-apps/davical/davical-1.1.9.3-r1.ebuild         | 74 ----------------------
 www-apps/davical/davical-1.1.9.3.ebuild            | 71 ---------------------
 .../files/davical-1.1.9.3-php8_compatibility.patch | 58 -----------------
 5 files changed, 277 deletions(-)

diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index cc13c34b5d5f..7d2d5b00161f 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,3 +1 @@
-DIST davical-1.1.10.tar.xz 1367356 BLAKE2B e93be0e4ce2768e13635247d006792a40865bcbe95698fa5bc7a7a20503acae0c1adbc1a2573f84043e4606342a468c5a606dab4c025edc9e68dae9a5d9aa10e SHA512 d307fc600c50bd294497ff9ab8fdc7a2d966e5360acb8babe3549a754204bbc73a44b89a1c4347f9527cf4f99e0091afc9bf92bbdd46e6843b5830489ad911aa
 DIST davical-1.1.11.tar.xz 1371432 BLAKE2B a1779175dfe112189e3e3fb8c317c568e8bac62ef15588058f9ac1cda61ede9c2f538da24bff2678f0457e1636538d12801c38dbb884ad9e0bc44482045bb07b SHA512 263bd11ca73c54689de3c3eefbadd9bcd99a88b60ce0922702584b42183302aa1e0dbee9559329d8789daae177f6e916dee803019e9059c6bc4ab1a855889d8f
-DIST davical-1.1.9.3.tar.xz 1359608 BLAKE2B d936fa5809413eac92e996262074972a04e1ac2d50d06c921e0f70468dde2b67175c6463d73ead09d5b2bce4ab1c2a02ccb45b64ee43066f6a9609c5ccdd01ee SHA512 cad28a991900d4cd9b1f86aeda7861482eef8707a02a371af53bd9cd17f9b5417ae81ccf1129d01fa5786f7bc9edc7478eb5a7274147039ce3ef603874c093a6

diff --git a/www-apps/davical/davical-1.1.10.ebuild b/www-apps/davical/davical-1.1.10.ebuild
deleted file mode 100644
index 55191dde88dd..000000000000
--- a/www-apps/davical/davical-1.1.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature 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"
-
-BDEPEND="sys-devel/gettext"
-
-RDEPEND="app-admin/pwgen
-	dev-lang/php[calendar,curl,iconv,imap,nls,pdo,postgres,xml]
-	dev-perl/DBD-Pg
-	dev-perl/DBI
-	dev-perl/YAML
-	>=dev-php/awl-0.62
-	virtual/httpd-php"
-
-need_httpd
-
-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
-
-	elog ""
-	optfeature "LDAP authentication" dev-lang/php[ldap]
-}

diff --git a/www-apps/davical/davical-1.1.9.3-r1.ebuild b/www-apps/davical/davical-1.1.9.3-r1.ebuild
deleted file mode 100644
index 88a416b0be46..000000000000
--- a/www-apps/davical/davical-1.1.9.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature 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"
-
-BDEPEND="sys-devel/gettext"
-
-RDEPEND="app-admin/pwgen
-	dev-lang/php[calendar,curl,iconv,imap,nls,pdo,postgres,xml]
-	dev-perl/DBD-Pg
-	dev-perl/DBI
-	dev-perl/YAML
-	>=dev-php/awl-0.61
-	virtual/httpd-php"
-
-PATCHES=( "${FILESDIR}/${P}-php8_compatibility.patch" )
-
-need_httpd
-
-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
-
-	elog ""
-	optfeature "LDAP authentication" dev-lang/php[ldap]
-}

diff --git a/www-apps/davical/davical-1.1.9.3.ebuild b/www-apps/davical/davical-1.1.9.3.ebuild
deleted file mode 100644
index 99d1d74b7ebe..000000000000
--- a/www-apps/davical/davical-1.1.9.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 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"
-
-# >=dev-lang/php-8:curly braces string offset access was removed (Bug 764908)
-RDEPEND="app-admin/pwgen
-	<dev-lang/php-8:*[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml]
-	dev-perl/DBD-Pg
-	dev-perl/DBI
-	dev-perl/YAML
-	>=dev-php/awl-0.61
-	virtual/httpd-php"
-
-need_httpd
-
-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/files/davical-1.1.9.3-php8_compatibility.patch b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch
deleted file mode 100644
index de9db47ff7fe..000000000000
--- a/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f376be164eacf51d7354c728094e697ee2336218 Mon Sep 17 00:00:00 2001
-From: Jan Hicken <jan.hicken@posteo.de>
-Date: Sun, 31 Jan 2021 11:46:32 +0100
-Subject: [PATCH 1/2] Use brackets instead of curly braces for string offset
- access
-
-Curly braces have been deprecated in PHP 7.4 and unsupported in PHP 8.0.
----
- inc/check_UTF8.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/inc/check_UTF8.php b/inc/check_UTF8.php
-index e3c93dbf..62dbfc00 100644
---- a/inc/check_UTF8.php
-+++ b/inc/check_UTF8.php
-@@ -67,7 +67,7 @@ function utf8ToUnicode(&$str)
- 
-   $len = strlen($str);
-   for($i = 0; $i < $len; $i++) {
--    $in = ord($str{$i});
-+    $in = ord($str[$i]);
-     if (0 == $mState) {
-       // When mState is zero we expect either a US-ASCII character or a
-       // multi-octet sequence.
--- 
-GitLab
-
-
-From 6cdbfcf226f0235a00206edfd119fcc90465a2b8 Mon Sep 17 00:00:00 2001
-From: Jan Hicken <jan.hicken@posteo.de>
-Date: Sun, 31 Jan 2021 11:47:41 +0100
-Subject: [PATCH 2/2] Add default value for errcontext variable in error
- handler function
-
-This variable is no longer passed in PHP 8.0.
-
-It cannot be removed however, because it would not be backwards
-compatible.
----
- htdocs/setup.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/htdocs/setup.php b/htdocs/setup.php
-index 8b13d0ad..2a82dbf3 100644
---- a/htdocs/setup.php
-+++ b/htdocs/setup.php
-@@ -13,7 +13,7 @@ function log_setup_error($errno , $errstr , $errfile , $errline) {
-   error_log('DAViCal setup.php: Informational: '.$errfile.'('.$errline.'): ['.$errno.'] '.$errstr);
- }
- 
--function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext ) {
-+function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext = null ) {
-   if ( $errno == 2 ) {
-     // A working installation will regularly fail to include_once() for several files as it searches for the location
-     log_setup_error($errno , $errstr , $errfile , $errline);
--- 
-GitLab
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-27 20:01 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-27 20:01 [gentoo-commits] repo/gentoo:master commit in: www-apps/davical/, www-apps/davical/files/ Michael Orlitzky
  -- strict thread matches above, loose matches on Subject: below --
2021-03-01  8:26 Joonas Niilola
2019-10-01  5:20 Joonas Niilola
2018-12-06  1:07 Virgil Dupras
2018-04-27  9:40 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox