summaryrefslogtreecommitdiff
path: root/www-apps/davical
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /www-apps/davical
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'www-apps/davical')
-rw-r--r--www-apps/davical/Manifest8
-rw-r--r--www-apps/davical/davical-1.1.7-r2.ebuild (renamed from www-apps/davical/davical-1.1.7-r1.ebuild)25
-rw-r--r--www-apps/davical/davical-1.1.8.ebuild (renamed from www-apps/davical/davical-1.1.7.ebuild)31
-rw-r--r--www-apps/davical/files/postinstall-en.txt15
-rw-r--r--www-apps/davical/files/postupgrade-en.txt4
5 files changed, 49 insertions, 34 deletions
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index b61f5c7b4477..e7f8cfe016fa 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,7 +1,9 @@
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 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
-EBUILD davical-1.1.7-r1.ebuild 1307 BLAKE2B a9cbc71f0586e2f0614077dfe711d8e73412f6a10abe643cfc9f3cf4883fbddc0a36f65021eff65b5723472ea59ea5f91be89cf08249908bc8f6f8743194383f SHA512 0eba7bcf05036cc95d55c5691a35ef22d626a82b7f2c4306ab745fde925596702b405922122e2bee553f51f6641f202c010f93fae451c9425ae2ad24b03b4556
-EBUILD davical-1.1.7.ebuild 1272 BLAKE2B 79c7b8181f50611ceb51ddbc0da6fa55a827ea2de44eb78ffcd7abb73132979b4699b659c987307e42b6baee07dbe148b5cb8d490d5fc31235d06a5eb9fd9e2e SHA512 301de270a523525ad93399b68ce892cb382e69d8d6c4b84d15915d1840760756ad6c8d0266dd67627d983d6016566cece93d375b82459d611547b4719f82bbc5
+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
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-r2.ebuild
index b3bad2197f85..9d2ef12cb2f7 100644
--- a/www-apps/davical/davical-1.1.7-r1.ebuild
+++ b/www-apps/davical/davical-1.1.7-r2.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit webapp
DESCRIPTION="A CalDAV and CardDAV Server"
-HOMEPAGE="https://davical.org/"
+HOMEPAGE="https://www.davical.org/"
SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
-LICENSE="GPL-2+"
+LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+"
KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+BDEPEND="sys-devel/gettext"
-DEPEND=">=dev-php/awl-0.59
- sys-devel/gettext"
RDEPEND="app-admin/pwgen
- dev-lang/php:*[calendar,curl,pdo,postgres,xml]
+ dev-lang/php:*[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml]
dev-perl/DBD-Pg
dev-perl/DBI
dev-perl/YAML
@@ -54,8 +55,18 @@ src_install() {
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.7.ebuild b/www-apps/davical/davical-1.1.8.ebuild
index 1f459316daa3..b7cc044e06db 100644
--- a/www-apps/davical/davical-1.1.7.ebuild
+++ b/www-apps/davical/davical-1.1.8.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit webapp
DESCRIPTION="A CalDAV and CardDAV Server"
-HOMEPAGE="https://davical.org/"
+HOMEPAGE="https://www.davical.org/"
SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
-LICENSE="GPL-2+"
+LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+"
KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+BDEPEND="sys-devel/gettext"
-DEPEND=">=dev-php/awl-0.59
- sys-devel/gettext"
RDEPEND="app-admin/pwgen
- dev-lang/php:*[calendar,curl,pdo,postgres,xml]
- dev-perl/DBI
+ 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
+ >=dev-php/awl-0.60
virtual/httpd-php"
need_httpd
@@ -33,7 +34,7 @@ src_compile() {
src_install() {
webapp_src_preinst
- dodoc INSTALL CREDITS README TODO ChangeLog
+ einstalldocs
einfo "Installing web files"
insinto "${MY_HTDOCSDIR}"
@@ -52,8 +53,18 @@ src_install() {
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 5a88a2bdf2e4..9a6192c15510 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 000000000000..51b86e2c4122
--- /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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 19:47:08 +0000