summaryrefslogtreecommitdiff
path: root/www-apps/baikal
diff options
context:
space:
mode:
Diffstat (limited to 'www-apps/baikal')
-rw-r--r--www-apps/baikal/Manifest7
-rw-r--r--www-apps/baikal/baikal-0.6.1.ebuild57
-rw-r--r--www-apps/baikal/baikal-0.7.1.ebuild58
-rw-r--r--www-apps/baikal/baikal-0.7.2.ebuild22
-rw-r--r--www-apps/baikal/files/postinstall-en.txt5
5 files changed, 14 insertions, 135 deletions
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index c0fb27014c24..afe184010221 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,9 +1,4 @@
-AUX postinstall-en.txt 272 BLAKE2B 2042cf6fbf8d98ef144d19002c3498e4e5f6238b8d135066920ee999facf14a65ba3ed1269228dedbd7f17932a894c399379c19fcf2fccf648d7a7f30b0ffb49 SHA512 4f902e053ac38e313698269decfabe750ca41e255076972eb439f7c753dba50f09879e54df09768daf643da13c81a7bcd1f9bee834da9d29e91a5be88b38c740
AUX postinstall-v0.7-en.txt 465 BLAKE2B adefd05b835bd3e27cc12137da53837dabd23790afe95fcc3e55e2dc1825342e96e2709c8d268fd0ec465b72faae7b5bd0fade0cb30fd0df2d8196bd49ae1e1b SHA512 8e532a5b229181cf32cc4a254688cc564a4a2dc80db64545fba0e093fa227a186a544b4dfc79c798e7d1021c1e01b7fb5f663f5b981082a32f6e6a0f98211df2
-DIST baikal-0.6.1.zip 3437686 BLAKE2B f28d3a63166a73571116759df3662c2b19c2eeeebcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00 SHA512 d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
-DIST baikal-0.7.1.zip 3596673 BLAKE2B ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5 SHA512 4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
DIST baikal-0.7.2.zip 3602276 BLAKE2B 160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9 SHA512 df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
-EBUILD baikal-0.6.1.ebuild 1449 BLAKE2B 21193bf53e21c7979ca0577b9dab5a7baaa1341e627d8a90eef80a0b9f325440ec91f7ef120d7758fcaa410b36ed01746aaeaa801c2e4219bfd8d2cf2b4ba20c SHA512 46f04d5c04793cb6b1db1688296644f5c6865f9f8049ce435103e946c4cce95cd4ef3a53d00a5e01d770bb95e32040c30b6964b29fd628cb7d049c1c0969fcf6
-EBUILD baikal-0.7.1.ebuild 1495 BLAKE2B eeed4fd23336d07ebb31e28a81bb408a40775e3bac1fcce7d173f9890ffe0c540d851811166b2bb3760621dcbe140ec3e328dc8fd8170aed97aa83eeb1f69d70 SHA512 873c0ea18387a0eb39dc9ca5348d404fa351d4a6b9dbc7a40fd0dd17877835fc51803d08f5f9f4d1419035edaf009711c88a7ced4647e6c3402cfe7bb20dc5d2
-EBUILD baikal-0.7.2.ebuild 1495 BLAKE2B 38079a7e73a0f87aa3539a7e40ea44b47818d8c6f550f63174d2bd893406f4da53027c2cc84c97f74e91cbc0ac0299d04e753e40250d22896f741c8876e73487 SHA512 ad2a6467f4217ccbebbf8cb4fca3c8d657900ef90cc6d18233856251b2bb5cb66804d353ba028002cf1546123dadd7ffba867fb232bd3677288e6016d2fffd3a
+EBUILD baikal-0.7.2.ebuild 1611 BLAKE2B e16c29f176061b80ef1fc1860678e2c61e5be960c3a12f45feaf0d15a07fe35c58354435d5ff357743baa40e819d66ef776e3cc546574ac07a0268b703adad1a SHA512 37f44fc2e1f437c16271e6f4e60ed457515dc49bce7dd29c891198c7fabadf75e6cd7d9865f5801ab3b56758f141b7a72758a5b072ab7c855ff3cd9b145b93bb
MISC metadata.xml 325 BLAKE2B 92c24f0b14c94c6666fe915eda815354af8f73d3f829ff414afcd4ff49b775191ee79ec9000718a795799060ccca8f10acf5ca27d861943ee5ac5c5a34d69ce0 SHA512 2b6f9ba13bbc4821f79703ba0fe5829b4ec30817b9571c05698d65cadbd52444bd3dcff42f0807f4fcdfc9269db6edb858bb0301a50546b0741929030bc196c9
diff --git a/www-apps/baikal/baikal-0.6.1.ebuild b/www-apps/baikal/baikal-0.6.1.ebuild
deleted file mode 100644
index ba407dd2359c..000000000000
--- a/www-apps/baikal/baikal-0.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="https://sabre.io/baikal/"
-SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
- mysql? ( virtual/mysql )
- sqlite? ( dev-db/sqlite )
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- webapp_src_preinst
-
- dodoc *.md
-
- einfo "Installing web files"
- insinto "${MY_HTDOCSDIR}"
- doins -r html/* html/.htaccess Core vendor
-
- einfo "Setting up container for configuration"
- insinto /etc/${PN}
-
- einfo "Fixing symlinks"
- local link target
- find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
- target=$(readlink "${link}")
- target=${target/..\/Core/Core}
- rm "${link}" && ln -s "${target}" "${link}"
- done
- dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
- dosym . "${MY_HTDOCSDIR}"/html
-
- webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
- webapp_src_install
-
- if has_version www-servers/apache ; then
- fowners -R apache:apache /etc/${PN}
- elif has_version www-servers/nginx ; then
- fowners -R nginx:nginx /etc/${PN}
- else
- einfo "/etc/${PN} must be owned by the webserver user for baikal"
- fi
-}
diff --git a/www-apps/baikal/baikal-0.7.1.ebuild b/www-apps/baikal/baikal-0.7.1.ebuild
deleted file mode 100644
index 450d04422760..000000000000
--- a/www-apps/baikal/baikal-0.7.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="https://sabre.io/baikal/"
-SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
- mysql? ( virtual/mysql )
- sqlite? ( dev-db/sqlite )
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- webapp_src_preinst
-
- dodoc *.md
-
- einfo "Installing web files"
- insinto "${MY_HTDOCSDIR}"
- doins -r html/* html/.htaccess Core vendor
-
- einfo "Setting up container for configuration"
- dodir /etc/${PN}
-
- einfo "Fixing symlinks"
- local link target
- find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
- target=$(readlink "${link}")
- target=${target/..\/Core/Core}
- rm "${link}" && ln -s "${target}" "${link}"
- done
- dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
- dosym /etc/${PN} "${MY_HTDOCSDIR}"/config
- dosym . "${MY_HTDOCSDIR}"/html
-
- webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
- webapp_src_install
-
- if has_version www-servers/apache ; then
- fowners -R apache:apache /etc/${PN}
- elif has_version www-servers/nginx ; then
- fowners -R nginx:nginx /etc/${PN}
- else
- einfo "/etc/${PN} must be owned by the webserver user for baikal"
- fi
-}
diff --git a/www-apps/baikal/baikal-0.7.2.ebuild b/www-apps/baikal/baikal-0.7.2.ebuild
index 39d0aca079d3..373282d259b3 100644
--- a/www-apps/baikal/baikal-0.7.2.ebuild
+++ b/www-apps/baikal/baikal-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -34,15 +34,19 @@ src_install() {
einfo "Setting up container for configuration"
dodir /etc/${PN}
- einfo "Fixing symlinks"
- local link target
- find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
- target=$(readlink "${link}")
- target=${target/..\/Core/Core}
- rm "${link}" && ln -s "${target}" "${link}"
+ # setup config in /etc
+ # we are not allowed to use straight-forward absolute symlink :(
+ local root path htdocsdir=${MY_HTDOCSDIR%/}
+ while [[ -n ${htdocsdir} ]] ; do
+ root+="../"
+ htdocsdir=${htdocsdir%/*}
+ # trim duplicate slashes
+ while [[ ${htdocsdir} == */ ]] ; do
+ htdocsdir=${htdocsdir%/}
+ done
done
- dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
- dosym /etc/${PN} "${MY_HTDOCSDIR}"/config
+ dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/Specific
+ dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/config
dosym . "${MY_HTDOCSDIR}"/html
webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
diff --git a/www-apps/baikal/files/postinstall-en.txt b/www-apps/baikal/files/postinstall-en.txt
deleted file mode 100644
index e6a11275dc85..000000000000
--- a/www-apps/baikal/files/postinstall-en.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-In order to setup baikal:
-- create /etc/${PN}/ENABLE_INSTALL owner apache:apache
-- point your browser at the instal's URL and follow the setup
-To upgrade baikal, you have to follow the setup instructions
-If you're upgrading from 0.2.7, see http://sabre.io/baikal/upgrade/