1 |
commit: 13f9c7650574042d734591b91cd3134652cbe0f7 |
2 |
Author: Till Schäfer <till2.schaefer <AT> uni-dortmund <DOT> de> |
3 |
AuthorDate: Thu Sep 26 19:41:26 2019 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 1 05:07:16 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f9c765 |
7 |
|
8 |
www-apps/davical: bump to 1.1.8 |
9 |
|
10 |
upgrade to EAPI 7 |
11 |
corrected dependencies |
12 |
add proper upgrade message |
13 |
add ldap use flag |
14 |
fix license |
15 |
backport changes to 1.1.7-r2 |
16 |
|
17 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
18 |
Signed-off-by: Till Schäfer <till2.schaefer <AT> uni-dortmund.de> |
19 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
20 |
|
21 |
www-apps/davical/Manifest | 1 + |
22 |
www-apps/davical/davical-1.1.7-r2.ebuild | 72 +++++++++++++++++++++++++++++++ |
23 |
www-apps/davical/davical-1.1.8.ebuild | 70 ++++++++++++++++++++++++++++++ |
24 |
www-apps/davical/files/postinstall-en.txt | 15 +------ |
25 |
www-apps/davical/files/postupgrade-en.txt | 4 ++ |
26 |
5 files changed, 148 insertions(+), 14 deletions(-) |
27 |
|
28 |
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest |
29 |
index 5e6249b3a8e..b6ad08ca438 100644 |
30 |
--- a/www-apps/davical/Manifest |
31 |
+++ b/www-apps/davical/Manifest |
32 |
@@ -1 +1,2 @@ |
33 |
DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455 |
34 |
+DIST davical-1.1.8.tar.xz 1358060 BLAKE2B 9b38081981e876bfdb025bfb5cbd57843645e399df0816658c395ab8c2447809930596a4adcc7bb30f357435735a435c75b03431505eec24fd5adb270845fc39 SHA512 e4a81a80086cdb67af47202865ad1652e83f276d2b82fc80b8bff60682027c911f2000052b1f32008269c77147462ec21886eae78fb3b5d4247b747fb9c4d1e6 |
35 |
|
36 |
diff --git a/www-apps/davical/davical-1.1.7-r2.ebuild b/www-apps/davical/davical-1.1.7-r2.ebuild |
37 |
new file mode 100644 |
38 |
index 00000000000..9d2ef12cb2f |
39 |
--- /dev/null |
40 |
+++ b/www-apps/davical/davical-1.1.7-r2.ebuild |
41 |
@@ -0,0 +1,72 @@ |
42 |
+# Copyright 1999-2019 Gentoo Authors |
43 |
+# Distributed under the terms of the GNU General Public License v2 |
44 |
+ |
45 |
+EAPI=7 |
46 |
+ |
47 |
+inherit webapp |
48 |
+ |
49 |
+DESCRIPTION="A CalDAV and CardDAV Server" |
50 |
+HOMEPAGE="https://www.davical.org/" |
51 |
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz" |
52 |
+ |
53 |
+LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+" |
54 |
+KEYWORDS="~amd64 ~x86" |
55 |
+IUSE="ldap" |
56 |
+ |
57 |
+BDEPEND="sys-devel/gettext" |
58 |
+ |
59 |
+RDEPEND="app-admin/pwgen |
60 |
+ dev-lang/php:*[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml] |
61 |
+ dev-perl/DBD-Pg |
62 |
+ dev-perl/DBI |
63 |
+ dev-perl/YAML |
64 |
+ >=dev-php/awl-0.59 |
65 |
+ virtual/httpd-php" |
66 |
+ |
67 |
+need_httpd |
68 |
+ |
69 |
+PATCHES=( "${FILESDIR}/${P}-fix_php4_style_constructors.patch" ) |
70 |
+ |
71 |
+S="${WORKDIR}" |
72 |
+ |
73 |
+src_compile() { |
74 |
+ emake built-locale |
75 |
+} |
76 |
+ |
77 |
+src_install() { |
78 |
+ webapp_src_preinst |
79 |
+ |
80 |
+ einstalldocs |
81 |
+ |
82 |
+ einfo "Installing web files" |
83 |
+ insinto "${MY_HTDOCSDIR}" |
84 |
+ doins -r htdocs/. htdocs/.htaccess |
85 |
+ |
86 |
+ einfo "Installing main files and i18n" |
87 |
+ insinto "${MY_HOSTROOTDIR}/${PN}" |
88 |
+ doins -r inc locale |
89 |
+ rm "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die |
90 |
+ |
91 |
+ einfo "Installing sql files" |
92 |
+ insinto "${MY_SQLSCRIPTSDIR}" |
93 |
+ doins -r dba/. |
94 |
+ |
95 |
+ insinto /etc/${PN} |
96 |
+ doins -r config/. "${FILESDIR}/vhost-example" |
97 |
+ |
98 |
+ webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" |
99 |
+ webapp_postupgrade_txt en "${FILESDIR}/postupgrade-en.txt" |
100 |
+ webapp_src_install |
101 |
+ |
102 |
+ fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh" |
103 |
+ fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database" |
104 |
+} |
105 |
+ |
106 |
+pkg_postinst() { |
107 |
+ elog "If you are upgrading from a previous version of davical, don't forget to" |
108 |
+ elog "upgrade the database structure with" |
109 |
+ elog " cd /usr/share/webapps/davical/${PVR}/sqlscripts/" |
110 |
+ elog " ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx" |
111 |
+ |
112 |
+ webapp_pkg_postinst |
113 |
+} |
114 |
|
115 |
diff --git a/www-apps/davical/davical-1.1.8.ebuild b/www-apps/davical/davical-1.1.8.ebuild |
116 |
new file mode 100644 |
117 |
index 00000000000..b7cc044e06d |
118 |
--- /dev/null |
119 |
+++ b/www-apps/davical/davical-1.1.8.ebuild |
120 |
@@ -0,0 +1,70 @@ |
121 |
+# Copyright 1999-2019 Gentoo Authors |
122 |
+# Distributed under the terms of the GNU General Public License v2 |
123 |
+ |
124 |
+EAPI=7 |
125 |
+ |
126 |
+inherit webapp |
127 |
+ |
128 |
+DESCRIPTION="A CalDAV and CardDAV Server" |
129 |
+HOMEPAGE="https://www.davical.org/" |
130 |
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz" |
131 |
+ |
132 |
+LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+" |
133 |
+KEYWORDS="~amd64 ~x86" |
134 |
+IUSE="ldap" |
135 |
+ |
136 |
+BDEPEND="sys-devel/gettext" |
137 |
+ |
138 |
+RDEPEND="app-admin/pwgen |
139 |
+ dev-lang/php:*[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml] |
140 |
+ dev-perl/DBD-Pg |
141 |
+ dev-perl/DBI |
142 |
+ dev-perl/YAML |
143 |
+ >=dev-php/awl-0.60 |
144 |
+ virtual/httpd-php" |
145 |
+ |
146 |
+need_httpd |
147 |
+ |
148 |
+S="${WORKDIR}" |
149 |
+ |
150 |
+src_compile() { |
151 |
+ emake built-locale |
152 |
+} |
153 |
+ |
154 |
+src_install() { |
155 |
+ webapp_src_preinst |
156 |
+ |
157 |
+ einstalldocs |
158 |
+ |
159 |
+ einfo "Installing web files" |
160 |
+ insinto "${MY_HTDOCSDIR}" |
161 |
+ doins -r htdocs/. htdocs/.htaccess |
162 |
+ |
163 |
+ einfo "Installing main files and i18n" |
164 |
+ insinto "${MY_HOSTROOTDIR}/${PN}" |
165 |
+ doins -r inc locale |
166 |
+ rm "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die |
167 |
+ |
168 |
+ einfo "Installing sql files" |
169 |
+ insinto "${MY_SQLSCRIPTSDIR}" |
170 |
+ doins -r dba/. |
171 |
+ |
172 |
+ insinto /etc/${PN} |
173 |
+ doins -r config/. "${FILESDIR}/vhost-example" |
174 |
+ |
175 |
+ webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" |
176 |
+ webapp_postupgrade_txt en "${FILESDIR}/postupgrade-en.txt" |
177 |
+ webapp_src_install |
178 |
+ |
179 |
+ fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh" |
180 |
+ fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database" |
181 |
+} |
182 |
+ |
183 |
+pkg_postinst() { |
184 |
+ elog "If you are upgrading from a previous version of davical, don't forget to" |
185 |
+ elog "upgrade the database structure with" |
186 |
+ elog " cd /usr/share/webapps/davical/${PVR}/sqlscripts/" |
187 |
+ elog " ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx" |
188 |
+ |
189 |
+ webapp_pkg_postinst |
190 |
+} |
191 |
|
192 |
diff --git a/www-apps/davical/files/postinstall-en.txt b/www-apps/davical/files/postinstall-en.txt |
193 |
index 5a88a2bdf2e..9a6192c1551 100644 |
194 |
--- a/www-apps/davical/files/postinstall-en.txt |
195 |
+++ b/www-apps/davical/files/postinstall-en.txt |
196 |
@@ -2,17 +2,4 @@ You will need access to postgresql database to use davical. |
197 |
|
198 |
Read /usr/share/doc/www-apps/davical-${PVR}/INSTALL.gz for installation |
199 |
instructions. |
200 |
-Release notes are available at |
201 |
-http://wiki.davical.org/w/Release_Notes/${PVR}. |
202 |
-Full documentation and wiki on http://davical.org |
203 |
- |
204 |
-If you are upgrading from a previous version of davical, don't forget to |
205 |
-upgrade the database structure with |
206 |
- cd /usr/share/webapps/davical/${PVR}/sqlscripts/ |
207 |
- ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx |
208 |
- |
209 |
-You can safely ignore any message about missing time_zone table. |
210 |
- |
211 |
-If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/ |
212 |
-have been moved away from the htdocs directory and placed into hostroot for |
213 |
-safety reasons. |
214 |
+Full documentation and wiki on http://www.davical.org |
215 |
|
216 |
diff --git a/www-apps/davical/files/postupgrade-en.txt b/www-apps/davical/files/postupgrade-en.txt |
217 |
new file mode 100644 |
218 |
index 00000000000..51b86e2c412 |
219 |
--- /dev/null |
220 |
+++ b/www-apps/davical/files/postupgrade-en.txt |
221 |
@@ -0,0 +1,4 @@ |
222 |
+If you are upgrading from a previous version of davical, don't forget to |
223 |
+upgrade the database structure with |
224 |
+ cd /usr/share/webapps/davical/${PVR}/sqlscripts/ |
225 |
+ ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx |