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/files/, www-apps/baikal/
Date: Thu, 07 Jan 2021 15:31:35
Message-Id: 1610033488.9c4d0cc83518582c5d33a412f5fef5c3cfbdb1a4.grobian@gentoo
1 commit: 9c4d0cc83518582c5d33a412f5fef5c3cfbdb1a4
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 7 14:46:06 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 7 15:31:28 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4d0cc8
7
8 www-apps/baikal: cleanup old
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 www-apps/baikal/Manifest | 2 --
14 www-apps/baikal/baikal-0.6.1.ebuild | 57 -------------------------------
15 www-apps/baikal/baikal-0.7.1.ebuild | 58 --------------------------------
16 www-apps/baikal/files/postinstall-en.txt | 5 ---
17 4 files changed, 122 deletions(-)
18
19 diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
20 index fc5ed08bf4d..de22ead2efa 100644
21 --- a/www-apps/baikal/Manifest
22 +++ b/www-apps/baikal/Manifest
23 @@ -1,3 +1 @@
24 -DIST baikal-0.6.1.zip 3437686 BLAKE2B f28d3a63166a73571116759df3662c2b19c2eeeebcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00 SHA512 d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
25 -DIST baikal-0.7.1.zip 3596673 BLAKE2B ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5 SHA512 4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
26 DIST baikal-0.7.2.zip 3602276 BLAKE2B 160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9 SHA512 df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
27
28 diff --git a/www-apps/baikal/baikal-0.6.1.ebuild b/www-apps/baikal/baikal-0.6.1.ebuild
29 deleted file mode 100644
30 index ba407dd2359..00000000000
31 --- a/www-apps/baikal/baikal-0.6.1.ebuild
32 +++ /dev/null
33 @@ -1,57 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="6"
38 -
39 -inherit webapp
40 -
41 -DESCRIPTION="Lightweight CalDAV+CardDAV server"
42 -HOMEPAGE="https://sabre.io/baikal/"
43 -SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
44 -
45 -LICENSE="GPL-3"
46 -KEYWORDS="~amd64 ~arm ~ppc64"
47 -IUSE="+mysql sqlite"
48 -REQUIRED_USE="|| ( mysql sqlite )"
49 -
50 -DEPEND="app-arch/unzip"
51 -RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
52 - mysql? ( virtual/mysql )
53 - sqlite? ( dev-db/sqlite )
54 - virtual/httpd-php"
55 -
56 -S=${WORKDIR}/${PN}
57 -
58 -src_install() {
59 - webapp_src_preinst
60 -
61 - dodoc *.md
62 -
63 - einfo "Installing web files"
64 - insinto "${MY_HTDOCSDIR}"
65 - doins -r html/* html/.htaccess Core vendor
66 -
67 - einfo "Setting up container for configuration"
68 - insinto /etc/${PN}
69 -
70 - einfo "Fixing symlinks"
71 - local link target
72 - find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
73 - target=$(readlink "${link}")
74 - target=${target/..\/Core/Core}
75 - rm "${link}" && ln -s "${target}" "${link}"
76 - done
77 - dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
78 - dosym . "${MY_HTDOCSDIR}"/html
79 -
80 - webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
81 - webapp_src_install
82 -
83 - if has_version www-servers/apache ; then
84 - fowners -R apache:apache /etc/${PN}
85 - elif has_version www-servers/nginx ; then
86 - fowners -R nginx:nginx /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.7.1.ebuild b/www-apps/baikal/baikal-0.7.1.ebuild
93 deleted file mode 100644
94 index 450d0442276..00000000000
95 --- a/www-apps/baikal/baikal-0.7.1.ebuild
96 +++ /dev/null
97 @@ -1,58 +0,0 @@
98 -# Copyright 1999-2020 Gentoo Authors
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI="6"
102 -
103 -inherit webapp
104 -
105 -DESCRIPTION="Lightweight CalDAV+CardDAV server"
106 -HOMEPAGE="https://sabre.io/baikal/"
107 -SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
108 -
109 -LICENSE="GPL-3"
110 -KEYWORDS="~amd64 ~arm ~ppc64"
111 -IUSE="+mysql sqlite"
112 -REQUIRED_USE="|| ( mysql sqlite )"
113 -
114 -DEPEND="app-arch/unzip"
115 -RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
116 - mysql? ( virtual/mysql )
117 - sqlite? ( dev-db/sqlite )
118 - virtual/httpd-php"
119 -
120 -S=${WORKDIR}/${PN}
121 -
122 -src_install() {
123 - webapp_src_preinst
124 -
125 - dodoc *.md
126 -
127 - einfo "Installing web files"
128 - insinto "${MY_HTDOCSDIR}"
129 - doins -r html/* html/.htaccess Core vendor
130 -
131 - einfo "Setting up container for configuration"
132 - dodir /etc/${PN}
133 -
134 - einfo "Fixing symlinks"
135 - local link target
136 - find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
137 - target=$(readlink "${link}")
138 - target=${target/..\/Core/Core}
139 - rm "${link}" && ln -s "${target}" "${link}"
140 - done
141 - dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
142 - dosym /etc/${PN} "${MY_HTDOCSDIR}"/config
143 - dosym . "${MY_HTDOCSDIR}"/html
144 -
145 - webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
146 - webapp_src_install
147 -
148 - if has_version www-servers/apache ; then
149 - fowners -R apache:apache /etc/${PN}
150 - elif has_version www-servers/nginx ; then
151 - fowners -R nginx:nginx /etc/${PN}
152 - else
153 - einfo "/etc/${PN} must be owned by the webserver user for baikal"
154 - fi
155 -}
156
157 diff --git a/www-apps/baikal/files/postinstall-en.txt b/www-apps/baikal/files/postinstall-en.txt
158 deleted file mode 100644
159 index e6a11275dc8..00000000000
160 --- a/www-apps/baikal/files/postinstall-en.txt
161 +++ /dev/null
162 @@ -1,5 +0,0 @@
163 -In order to setup baikal:
164 -- create /etc/${PN}/ENABLE_INSTALL owner apache:apache
165 -- point your browser at the instal's URL and follow the setup
166 -To upgrade baikal, you have to follow the setup instructions
167 -If you're upgrading from 0.2.7, see http://sabre.io/baikal/upgrade/