Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/
Date: Tue, 20 Mar 2018 19:48:25
Message-Id: 1521575285.234aec9875208e554707416c18e69002dc0749b7.grobian@gentoo
1 commit: 234aec9875208e554707416c18e69002dc0749b7
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 20 19:47:54 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 20 19:48:05 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234aec98
7
8 www-apps/baikal: drop old, bug #650924
9
10 Closes: https://bugs.gentoo.org/650924
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 www-apps/baikal/Manifest | 3 --
14 www-apps/baikal/baikal-0.2.7.ebuild | 55 ------------------------------------
15 www-apps/baikal/baikal-0.3.5.ebuild | 56 -------------------------------------
16 www-apps/baikal/baikal-0.4.4.ebuild | 56 -------------------------------------
17 www-apps/baikal/baikal-0.4.6.ebuild | 4 +--
18 5 files changed, 2 insertions(+), 172 deletions(-)
19
20 diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
21 index cf8f402ecb6..cbef3174258 100644
22 --- a/www-apps/baikal/Manifest
23 +++ b/www-apps/baikal/Manifest
24 @@ -1,4 +1 @@
25 -DIST baikal-0.3.5.zip 3282401 BLAKE2B 7b44e4b888e2689bab8d64dbefe85ade742703001b781dc9d65f7c83763c14de7df5c0c47d4a9a003948638338b7c82edd3c3ee3cd5bd4d67580252e0a682558 SHA512 b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d
26 -DIST baikal-0.4.4.zip 3285109 BLAKE2B 2d880cf9432c803f228304cb92922234ce5c6da67bb383595e93b8880bee5ce08c96331bfbccd4332b8e3cc651487ae14606f053b7d05148c0a6505719d99e72 SHA512 3617b5dffddf074a30c6a463b3074c5dc33bbb22d53c3ace4bb705b83a778beed40e3fd5978ebd2019aeed4fdeb836217d18fcbcebb8de309c047dcab92e2d11
27 DIST baikal-0.4.6.zip 3288478 BLAKE2B e841c405e59808411999475431e79945a00f2de33228d6a46812acca03b742c1c23349c59d6501b0a1b39587030047682fbc92ead54565766f81a19ee76efdc0 SHA512 8cb4141deb4233858764e6bd0eb44691c5e31677dd6dde09e8249675a331115af8bbcf181c4371338165a0ef40f894dfc4ed0502b46a6bc8387924f6a65725a1
28 -DIST baikal-regular-0.2.7.tgz 2273699 BLAKE2B 8394939d578cf5b714f20f0fc26d9807e0b23a717dc9b61230606f466e7365132abdcef6ef9fe80de1aa9c192eb94122f317c2b810979df4f2c523e410e05650 SHA512 261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e33333a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f
29
30 diff --git a/www-apps/baikal/baikal-0.2.7.ebuild b/www-apps/baikal/baikal-0.2.7.ebuild
31 deleted file mode 100644
32 index 6d36fb9754d..00000000000
33 --- a/www-apps/baikal/baikal-0.2.7.ebuild
34 +++ /dev/null
35 @@ -1,55 +0,0 @@
36 -# Copyright 1999-2015 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI="5"
40 -
41 -inherit webapp
42 -
43 -DESCRIPTION="Lightweight CalDAV+CardDAV server"
44 -HOMEPAGE="http://baikal-server.com/"
45 -SRC_URI="http://baikal-server.com/get/${PN}-regular-${PV}.tgz"
46 -
47 -LICENSE="GPL-3"
48 -KEYWORDS="~amd64"
49 -IUSE="+mysql sqlite"
50 -REQUIRED_USE="|| ( mysql sqlite )"
51 -
52 -RDEPEND=">=dev-lang/php-5.3[ctype,filter,pdo,session,xml,mysql?,sqlite?]
53 - mysql? ( virtual/mysql )
54 - sqlite? ( dev-db/sqlite )
55 - virtual/httpd-php"
56 -
57 -S=${WORKDIR}/${PN}-regular
58 -
59 -src_install() {
60 - webapp_src_preinst
61 -
62 - dodoc *.md || die "dodoc failed"
63 -
64 - einfo "Installing web files"
65 - insinto "${MY_HTDOCSDIR}"
66 - doins -r html/* html/.htaccess Core vendor || die "doins failed"
67 -
68 - einfo "Setting up container for configuration"
69 - insinto /etc/${PN}
70 - doins Specific/.htaccess || die "doins failed"
71 -
72 - einfo "Fixing symlinks"
73 - local link target
74 - find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
75 - target=$(readlink "${link}")
76 - target=${target/..\/Core/Core}
77 - rm "${link}" && ln -s "${target}" "${link}"
78 - done
79 - dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
80 - dosym . "${MY_HTDOCSDIR}"/html
81 -
82 - webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
83 - webapp_src_install
84 -
85 - if has_version www-servers/apache ; then
86 - fowners -R apache:apache /etc/${PN}
87 - else
88 - einfo "/etc/${PN} must be owned by the webserver user for baikal"
89 - fi
90 -}
91
92 diff --git a/www-apps/baikal/baikal-0.3.5.ebuild b/www-apps/baikal/baikal-0.3.5.ebuild
93 deleted file mode 100644
94 index 8e83aa8754e..00000000000
95 --- a/www-apps/baikal/baikal-0.3.5.ebuild
96 +++ /dev/null
97 @@ -1,56 +0,0 @@
98 -# Copyright 1999-2016 Gentoo Foundation
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI="5"
102 -
103 -inherit webapp
104 -
105 -DESCRIPTION="Lightweight CalDAV+CardDAV server"
106 -HOMEPAGE="http://sabre.io/baikal/"
107 -SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
108 -
109 -LICENSE="GPL-3"
110 -KEYWORDS="~amd64 ~arm"
111 -IUSE="+mysql sqlite"
112 -REQUIRED_USE="|| ( mysql sqlite )"
113 -
114 -RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
115 - mysql? ( virtual/mysql )
116 - sqlite? ( dev-db/sqlite )
117 - virtual/httpd-php"
118 -
119 -S=${WORKDIR}/${PN}
120 -
121 -src_install() {
122 - webapp_src_preinst
123 -
124 - dodoc *.md || die "dodoc failed"
125 -
126 - einfo "Installing web files"
127 - insinto "${MY_HTDOCSDIR}"
128 - doins -r html/* html/.htaccess Core vendor || die "doins failed"
129 -
130 - einfo "Setting up container for configuration"
131 - insinto /etc/${PN}
132 -
133 - einfo "Fixing symlinks"
134 - local link target
135 - find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
136 - target=$(readlink "${link}")
137 - target=${target/..\/Core/Core}
138 - rm "${link}" && ln -s "${target}" "${link}"
139 - done
140 - dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
141 - dosym . "${MY_HTDOCSDIR}"/html
142 -
143 - webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
144 - webapp_src_install
145 -
146 - if has_version www-servers/apache ; then
147 - fowners -R apache:apache /etc/${PN}
148 - elif has_version www-servers/nginx ; then
149 - fowners -R nginx:nginx /etc/${PN}
150 - else
151 - einfo "/etc/${PN} must be owned by the webserver user for baikal"
152 - fi
153 -}
154
155 diff --git a/www-apps/baikal/baikal-0.4.4.ebuild b/www-apps/baikal/baikal-0.4.4.ebuild
156 deleted file mode 100644
157 index bf20db84b6c..00000000000
158 --- a/www-apps/baikal/baikal-0.4.4.ebuild
159 +++ /dev/null
160 @@ -1,56 +0,0 @@
161 -# Copyright 1999-2016 Gentoo Foundation
162 -# Distributed under the terms of the GNU General Public License v2
163 -
164 -EAPI="5"
165 -
166 -inherit webapp
167 -
168 -DESCRIPTION="Lightweight CalDAV+CardDAV server"
169 -HOMEPAGE="http://sabre.io/baikal/"
170 -SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
171 -
172 -LICENSE="GPL-3"
173 -KEYWORDS="~amd64 ~arm"
174 -IUSE="+mysql sqlite"
175 -REQUIRED_USE="|| ( mysql sqlite )"
176 -
177 -RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
178 - mysql? ( virtual/mysql )
179 - sqlite? ( dev-db/sqlite )
180 - virtual/httpd-php"
181 -
182 -S=${WORKDIR}/${PN}
183 -
184 -src_install() {
185 - webapp_src_preinst
186 -
187 - dodoc *.md || die "dodoc failed"
188 -
189 - einfo "Installing web files"
190 - insinto "${MY_HTDOCSDIR}"
191 - doins -r html/* html/.htaccess Core vendor || die "doins failed"
192 -
193 - einfo "Setting up container for configuration"
194 - insinto /etc/${PN}
195 -
196 - einfo "Fixing symlinks"
197 - local link target
198 - find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
199 - target=$(readlink "${link}")
200 - target=${target/..\/Core/Core}
201 - rm "${link}" && ln -s "${target}" "${link}"
202 - done
203 - dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
204 - dosym . "${MY_HTDOCSDIR}"/html
205 -
206 - webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
207 - webapp_src_install
208 -
209 - if has_version www-servers/apache ; then
210 - fowners -R apache:apache /etc/${PN}
211 - elif has_version www-servers/nginx ; then
212 - fowners -R nginx:nginx /etc/${PN}
213 - else
214 - einfo "/etc/${PN} must be owned by the webserver user for baikal"
215 - fi
216 -}
217
218 diff --git a/www-apps/baikal/baikal-0.4.6.ebuild b/www-apps/baikal/baikal-0.4.6.ebuild
219 index bf20db84b6c..70a40f4bbc7 100644
220 --- a/www-apps/baikal/baikal-0.4.6.ebuild
221 +++ b/www-apps/baikal/baikal-0.4.6.ebuild
222 @@ -1,4 +1,4 @@
223 -# Copyright 1999-2016 Gentoo Foundation
224 +# Copyright 1999-2018 Gentoo Foundation
225 # Distributed under the terms of the GNU General Public License v2
226
227 EAPI="5"
228 @@ -10,7 +10,7 @@ HOMEPAGE="http://sabre.io/baikal/"
229 SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
230
231 LICENSE="GPL-3"
232 -KEYWORDS="~amd64 ~arm"
233 +KEYWORDS="~amd64 ~arm ~ppc64"
234 IUSE="+mysql sqlite"
235 REQUIRED_USE="|| ( mysql sqlite )"