[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2024-05-11 Thread Fabian Groffen
commit: 9463c23c4563ece2a22a0c25fc89249354149f1b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat May 11 08:04:38 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat May 11 08:05:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9463c23c

www-apps/baikal-0.9.5: version bump #931579

Closes: https://bugs.gentoo.org/931579
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest   |  3 +-
 www-apps/baikal/baikal-0.8.0.ebuild| 62 --
 .../{baikal-0.9.1.ebuild => baikal-0.9.5.ebuild}   |  9 +---
 3 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 712f35a19773..82d2098ed889 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,2 @@
-DIST baikal-0.8.0.zip 3282996 BLAKE2B 
102f6ce944804faad1032edaa8cac28f37b278a61de58fd3719e60d26bf9213c2e00965dc48476a1e47ae1710178e6cc494fc9da3af63d3f073ef5abed7d7da1
 SHA512 
8a43e6a88aaa8eded779db940d970afe9fb37606b9547cbf97d209a7ef54128d1c5f100de917b60362bf131b21f9e82613f482453974635a8e64c798513fd5c6
-DIST baikal-0.9.1.zip 2981404 BLAKE2B 
65eecd989f8b903bea35e8a4bf1be83eb322aecc13460370712ddc36420215d3facbc2161069b3c9d451ec74d8f2d336aba4c06f528eac35ebb243fb47cde00d
 SHA512 
28a08eb701bdd5a752675bdb05a233b77310a8b024ec1452b548be231a610dd17d5871664cf689054657fd849742a9debe0ba0de92272c3ac3f2568c49d8af70
 DIST baikal-0.9.3.zip 2978666 BLAKE2B 
f2726560916979766c95af0ff63cb1cbd5bb677f377ea20e41064c0a88725742193341e6a3246f64930c445f425a7026499ed55f1949ee221da553bfec538755
 SHA512 
bdcd3848ba7c99f94a1f20c9fee48f24bb9e004a325f482d6b5324eff1f0aa2fddd284ff5f9ae6dd0b67455852aa82e434174358c58d76b6009945bc3395768c
+DIST baikal-0.9.5.zip 2828793 BLAKE2B 
bd4c2e5887a78da6e1bd94c73452a1df22a68d626572aca728758bd95553c5f79a99d47418909b339a837efff25a12ef8b3e1c041ba32b888224b04e93201206
 SHA512 
e544ed39047788bf001c81a44eb69a3db30a871253cb6bf12b54d5d476eaadc63d723192d41b67f2cf908a72d4c722def03d853df68b7fd464a4093e08ed0f19

diff --git a/www-apps/baikal/baikal-0.8.0.ebuild 
b/www-apps/baikal/baikal-0.8.0.ebuild
deleted file mode 100644
index bcc8eac313f6..
--- a/www-apps/baikal/baikal-0.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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}
-
-   # 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 ${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"
-   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.9.1.ebuild 
b/www-apps/baikal/baikal-0.9.5.ebuild
similarity index 85%
rename from www-apps/baikal/baikal-0.9.1.ebuild
rename to www-apps/baikal/baikal-0.9.5.ebuild
index 7d0172732149..7def5f0dd436 100644
--- a/www-apps/baikal/baikal-0.9.1.ebuild
+++ b/www-apps/baikal/baikal-0.9.5.ebuild
@@ -33,6 +33,7 @@ src_install() {
 
einfo "Setting up container for configuration"
dodir /etc/${PN}
+   fperms o+x /etc/${PN}  # allow webserver to read config
 
# setup config in /etc
# we are not allowed to use straight-forward absolute symlink :(
@@ -51,12 +52,4 @@ src_install() {
 
webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
webapp_src_install

[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2023-05-07 Thread Fabian Groffen
commit: 40c5aa5201719da5393b92cba6c817bd19f3709d
Author: sro0  localhost>
AuthorDate: Sun May  7 14:32:08 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun May  7 15:07:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c5aa52

www-apps/baikal: version bump to 0.9.3

Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest|  1 +
 www-apps/baikal/baikal-0.9.3.ebuild | 62 +
 2 files changed, 63 insertions(+)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index e9c09cbea3e8..5f88ec75b2f1 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,4 @@
 DIST baikal-0.7.2.zip 3602276 BLAKE2B 
160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9
 SHA512 
df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
 DIST baikal-0.8.0.zip 3282996 BLAKE2B 
102f6ce944804faad1032edaa8cac28f37b278a61de58fd3719e60d26bf9213c2e00965dc48476a1e47ae1710178e6cc494fc9da3af63d3f073ef5abed7d7da1
 SHA512 
8a43e6a88aaa8eded779db940d970afe9fb37606b9547cbf97d209a7ef54128d1c5f100de917b60362bf131b21f9e82613f482453974635a8e64c798513fd5c6
 DIST baikal-0.9.1.zip 2981404 BLAKE2B 
65eecd989f8b903bea35e8a4bf1be83eb322aecc13460370712ddc36420215d3facbc2161069b3c9d451ec74d8f2d336aba4c06f528eac35ebb243fb47cde00d
 SHA512 
28a08eb701bdd5a752675bdb05a233b77310a8b024ec1452b548be231a610dd17d5871664cf689054657fd849742a9debe0ba0de92272c3ac3f2568c49d8af70
+DIST baikal-0.9.3.zip 2978666 BLAKE2B 
f2726560916979766c95af0ff63cb1cbd5bb677f377ea20e41064c0a88725742193341e6a3246f64930c445f425a7026499ed55f1949ee221da553bfec538755
 SHA512 
bdcd3848ba7c99f94a1f20c9fee48f24bb9e004a325f482d6b5324eff1f0aa2fddd284ff5f9ae6dd0b67455852aa82e434174358c58d76b6009945bc3395768c

diff --git a/www-apps/baikal/baikal-0.9.3.ebuild 
b/www-apps/baikal/baikal-0.9.3.ebuild
new file mode 100644
index ..7d0172732149
--- /dev/null
+++ b/www-apps/baikal/baikal-0.9.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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 ~riscv"
+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}
+
+   # 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 ${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"
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2023-05-07 Thread Fabian Groffen
commit: 0ed00408117a113c8f8beb51966137287a22051d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun May  7 15:07:32 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun May  7 15:07:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed00408

www-apps/baikal: cleanup

Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest|  1 -
 www-apps/baikal/baikal-0.7.2.ebuild | 62 -
 2 files changed, 63 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 5f88ec75b2f1..712f35a19773 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,4 +1,3 @@
-DIST baikal-0.7.2.zip 3602276 BLAKE2B 
160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9
 SHA512 
df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
 DIST baikal-0.8.0.zip 3282996 BLAKE2B 
102f6ce944804faad1032edaa8cac28f37b278a61de58fd3719e60d26bf9213c2e00965dc48476a1e47ae1710178e6cc494fc9da3af63d3f073ef5abed7d7da1
 SHA512 
8a43e6a88aaa8eded779db940d970afe9fb37606b9547cbf97d209a7ef54128d1c5f100de917b60362bf131b21f9e82613f482453974635a8e64c798513fd5c6
 DIST baikal-0.9.1.zip 2981404 BLAKE2B 
65eecd989f8b903bea35e8a4bf1be83eb322aecc13460370712ddc36420215d3facbc2161069b3c9d451ec74d8f2d336aba4c06f528eac35ebb243fb47cde00d
 SHA512 
28a08eb701bdd5a752675bdb05a233b77310a8b024ec1452b548be231a610dd17d5871664cf689054657fd849742a9debe0ba0de92272c3ac3f2568c49d8af70
 DIST baikal-0.9.3.zip 2978666 BLAKE2B 
f2726560916979766c95af0ff63cb1cbd5bb677f377ea20e41064c0a88725742193341e6a3246f64930c445f425a7026499ed55f1949ee221da553bfec538755
 SHA512 
bdcd3848ba7c99f94a1f20c9fee48f24bb9e004a325f482d6b5324eff1f0aa2fddd284ff5f9ae6dd0b67455852aa82e434174358c58d76b6009945bc3395768c

diff --git a/www-apps/baikal/baikal-0.7.2.ebuild 
b/www-apps/baikal/baikal-0.7.2.ebuild
deleted file mode 100644
index 373282d259b3..
--- a/www-apps/baikal/baikal-0.7.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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}
-
-   # 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 ${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"
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2022-11-03 Thread Jakov Smolić
commit: 312f7ca0a5655de20144417f0868c6c2a02313d0
Author: Chris Su  lesscrowds  org>
AuthorDate: Thu Nov  3 14:02:09 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Nov  4 05:39:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312f7ca0

www-apps/baikal: Keyword 0.9.1 riscv, #879337

Signed-off-by: Chris Su  lesscrowds.org>
Closes: https://github.com/gentoo/gentoo/pull/28122
Signed-off-by: Jakov Smolić  gentoo.org>

 www-apps/baikal/baikal-0.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/baikal/baikal-0.9.1.ebuild 
b/www-apps/baikal/baikal-0.9.1.ebuild
index bcc8eac313f6..7d0172732149 100644
--- a/www-apps/baikal/baikal-0.9.1.ebuild
+++ b/www-apps/baikal/baikal-0.9.1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~ppc64 ~riscv"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2022-01-08 Thread Fabian Groffen
commit: fbec7d7c7443c5401724296f8cada5c22bf2934d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jan  8 19:04:50 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jan  8 19:04:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbec7d7c

www-apps/baikal-0.9.1: version bump

Bug: https://bugs.gentoo.org/821169
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest|  1 +
 www-apps/baikal/baikal-0.9.1.ebuild | 62 +
 2 files changed, 63 insertions(+)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 1bdb0a8d5eca..e9c09cbea3e8 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,2 +1,3 @@
 DIST baikal-0.7.2.zip 3602276 BLAKE2B 
160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9
 SHA512 
df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
 DIST baikal-0.8.0.zip 3282996 BLAKE2B 
102f6ce944804faad1032edaa8cac28f37b278a61de58fd3719e60d26bf9213c2e00965dc48476a1e47ae1710178e6cc494fc9da3af63d3f073ef5abed7d7da1
 SHA512 
8a43e6a88aaa8eded779db940d970afe9fb37606b9547cbf97d209a7ef54128d1c5f100de917b60362bf131b21f9e82613f482453974635a8e64c798513fd5c6
+DIST baikal-0.9.1.zip 2981404 BLAKE2B 
65eecd989f8b903bea35e8a4bf1be83eb322aecc13460370712ddc36420215d3facbc2161069b3c9d451ec74d8f2d336aba4c06f528eac35ebb243fb47cde00d
 SHA512 
28a08eb701bdd5a752675bdb05a233b77310a8b024ec1452b548be231a610dd17d5871664cf689054657fd849742a9debe0ba0de92272c3ac3f2568c49d8af70

diff --git a/www-apps/baikal/baikal-0.9.1.ebuild 
b/www-apps/baikal/baikal-0.9.1.ebuild
new file mode 100644
index ..bcc8eac313f6
--- /dev/null
+++ b/www-apps/baikal/baikal-0.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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}
+
+   # 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 ${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"
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2022-01-07 Thread Fabian Groffen
commit: 8fe186fb28adeee5db505c141c5aed04d3e47013
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan  7 09:20:02 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan  7 09:20:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe186fb

www-apps/baikal-0.8.0: version bump, bug #821169

Closes: https://bugs.gentoo.org/821169
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest|  1 +
 www-apps/baikal/baikal-0.8.0.ebuild | 62 +
 2 files changed, 63 insertions(+)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index de22ead2efac..1bdb0a8d5eca 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1 +1,2 @@
 DIST baikal-0.7.2.zip 3602276 BLAKE2B 
160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9
 SHA512 
df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
+DIST baikal-0.8.0.zip 3282996 BLAKE2B 
102f6ce944804faad1032edaa8cac28f37b278a61de58fd3719e60d26bf9213c2e00965dc48476a1e47ae1710178e6cc494fc9da3af63d3f073ef5abed7d7da1
 SHA512 
8a43e6a88aaa8eded779db940d970afe9fb37606b9547cbf97d209a7ef54128d1c5f100de917b60362bf131b21f9e82613f482453974635a8e64c798513fd5c6

diff --git a/www-apps/baikal/baikal-0.8.0.ebuild 
b/www-apps/baikal/baikal-0.8.0.ebuild
new file mode 100644
index ..bcc8eac313f6
--- /dev/null
+++ b/www-apps/baikal/baikal-0.8.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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}
+
+   # 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 ${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"
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2021-01-10 Thread Sam James
commit: 9f4dec77c9d506084b8fab118e9c9aa42dc64b93
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 10 22:03:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 10 22:27:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4dec77

www-apps/baikal: mark ALLARCHES

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 www-apps/baikal/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www-apps/baikal/metadata.xml b/www-apps/baikal/metadata.xml
index 4c3fd25c6ce..ed5e0711323 100644
--- a/www-apps/baikal/metadata.xml
+++ b/www-apps/baikal/metadata.xml
@@ -5,6 +5,7 @@
grob...@gentoo.org
Fabian Groffen

+   

fruux/Baikal




[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2021-01-07 Thread Fabian Groffen
commit: 280c4f83d84818e3ba4391b1c7f69f8711870e39
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jan  7 15:31:23 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jan  7 15:31:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280c4f83

www-apps/baikal: use relative symlink to config

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/baikal-0.7.2.ebuild | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/www-apps/baikal/baikal-0.7.2.ebuild 
b/www-apps/baikal/baikal-0.7.2.ebuild
index 39d0aca079d..373282d259b 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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/files/, www-apps/baikal/

2021-01-07 Thread Fabian Groffen
commit: 9c4d0cc83518582c5d33a412f5fef5c3cfbdb1a4
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jan  7 14:46:06 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jan  7 15:31:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4d0cc8

www-apps/baikal: cleanup old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest |  2 --
 www-apps/baikal/baikal-0.6.1.ebuild  | 57 ---
 www-apps/baikal/baikal-0.7.1.ebuild  | 58 
 www-apps/baikal/files/postinstall-en.txt |  5 ---
 4 files changed, 122 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index fc5ed08bf4d..de22ead2efa 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1 @@
-DIST baikal-0.6.1.zip 3437686 BLAKE2B 
f28d3a63166a73571116759df3662c2b19c2bcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00
 SHA512 
d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
-DIST baikal-0.7.1.zip 3596673 BLAKE2B 
ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5
 SHA512 
4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
 DIST baikal-0.7.2.zip 3602276 BLAKE2B 
160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9
 SHA512 
df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3

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 ba407dd2359..000
--- 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 450d0442276..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2020-12-24 Thread Fabian Groffen
commit: 73702578e1d25a3ada7598e85dc9aeb6da5b0163
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Dec 24 08:46:50 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Dec 24 08:50:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73702578

www-apps/baikal: version bump 0.7.2, address PHP8 json default

Closes: https://bugs.gentoo.org/758983
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest | 2 +-
 www-apps/baikal/baikal-0.6.1.ebuild  | 2 +-
 www-apps/baikal/baikal-0.7.1.ebuild  | 2 +-
 www-apps/baikal/{baikal-0.6.0.ebuild => baikal-0.7.2.ebuild} | 9 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index f6f42ce4b17..fc5ed08bf4d 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,3 @@
-DIST baikal-0.6.0.zip 3432758 BLAKE2B 
db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104
 SHA512 
75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
 DIST baikal-0.6.1.zip 3437686 BLAKE2B 
f28d3a63166a73571116759df3662c2b19c2bcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00
 SHA512 
d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
 DIST baikal-0.7.1.zip 3596673 BLAKE2B 
ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5
 SHA512 
4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
+DIST baikal-0.7.2.zip 3602276 BLAKE2B 
160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9
 SHA512 
df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3

diff --git a/www-apps/baikal/baikal-0.6.1.ebuild 
b/www-apps/baikal/baikal-0.6.1.ebuild
index b8a74120fed..ba407dd2359 100644
--- a/www-apps/baikal/baikal-0.6.1.ebuild
+++ b/www-apps/baikal/baikal-0.6.1.ebuild
@@ -15,7 +15,7 @@ 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?]
+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"

diff --git a/www-apps/baikal/baikal-0.7.1.ebuild 
b/www-apps/baikal/baikal-0.7.1.ebuild
index 1c55957ab51..450d0442276 100644
--- a/www-apps/baikal/baikal-0.7.1.ebuild
+++ b/www-apps/baikal/baikal-0.7.1.ebuild
@@ -15,7 +15,7 @@ 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?]
+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"

diff --git a/www-apps/baikal/baikal-0.6.0.ebuild 
b/www-apps/baikal/baikal-0.7.2.ebuild
similarity index 84%
rename from www-apps/baikal/baikal-0.6.0.ebuild
rename to www-apps/baikal/baikal-0.7.2.ebuild
index b8a74120fed..39d0aca079d 100644
--- a/www-apps/baikal/baikal-0.6.0.ebuild
+++ b/www-apps/baikal/baikal-0.7.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit webapp
 
@@ -15,7 +15,7 @@ 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?]
+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"
@@ -32,7 +32,7 @@ src_install() {
doins -r html/* html/.htaccess Core vendor
 
einfo "Setting up container for configuration"
-   insinto /etc/${PN}
+   dodir /etc/${PN}
 
einfo "Fixing symlinks"
local link target
@@ -42,9 +42,10 @@ src_install() {
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-en.txt"
+   webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
webapp_src_install
 
i

[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/files/, www-apps/baikal/

2020-06-14 Thread Fabian Groffen
commit: 9963aede3bcd793829740832cfd1eecc1c5236f3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jun 14 08:46:02 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jun 14 08:46:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9963aede

www-apps/baikal-0.7.1: version bump

Closes: https://bugs.gentoo.org/727936
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest | 2 +-
 www-apps/baikal/{baikal-0.5.2.ebuild => baikal-0.7.1.ebuild} | 7 ---
 www-apps/baikal/files/postinstall-v0.7-en.txt| 9 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 841948ccdf5..f6f42ce4b17 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,3 @@
-DIST baikal-0.5.2.zip 3426025 BLAKE2B 
ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922
 SHA512 
58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
 DIST baikal-0.6.0.zip 3432758 BLAKE2B 
db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104
 SHA512 
75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
 DIST baikal-0.6.1.zip 3437686 BLAKE2B 
f28d3a63166a73571116759df3662c2b19c2bcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00
 SHA512 
d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
+DIST baikal-0.7.1.zip 3596673 BLAKE2B 
ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5
 SHA512 
4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54

diff --git a/www-apps/baikal/baikal-0.5.2.ebuild 
b/www-apps/baikal/baikal-0.7.1.ebuild
similarity index 85%
rename from www-apps/baikal/baikal-0.5.2.ebuild
rename to www-apps/baikal/baikal-0.7.1.ebuild
index 24e74850aa4..1c55957ab51 100644
--- a/www-apps/baikal/baikal-0.5.2.ebuild
+++ b/www-apps/baikal/baikal-0.7.1.ebuild
@@ -15,7 +15,7 @@ IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
 DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+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"
@@ -32,7 +32,7 @@ src_install() {
doins -r html/* html/.htaccess Core vendor
 
einfo "Setting up container for configuration"
-   insinto /etc/${PN}
+   dodir /etc/${PN}
 
einfo "Fixing symlinks"
local link target
@@ -42,9 +42,10 @@ src_install() {
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-en.txt"
+   webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
webapp_src_install
 
if has_version www-servers/apache ; then

diff --git a/www-apps/baikal/files/postinstall-v0.7-en.txt 
b/www-apps/baikal/files/postinstall-v0.7-en.txt
new file mode 100644
index 000..ab3ec6459f9
--- /dev/null
+++ b/www-apps/baikal/files/postinstall-v0.7-en.txt
@@ -0,0 +1,9 @@
+To install, point your browser at the installation url:
+  /admin/install
+To upgrade baikal, do the same but note that starting from version 0.7.0
+baikal now uses a yaml file instead of php config.  The installer will
+try to convert your configuration, but fail to retain your MySQL
+database config (if you use that).
+  https://github.com/sabre-io/Baikal/issues/943
+Simply edit the /etc/baikal/baikal.yaml file and add the missing values
+under the database section.



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2020-04-22 Thread Fabian Groffen
commit: 1dae9522693c0f33f391801d1a9ae811b25d2de1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Apr 22 07:10:37 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Apr 22 07:10:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dae9522

www-apps/baikal-0.6.1: version bump

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest|  1 +
 www-apps/baikal/baikal-0.6.1.ebuild | 57 +
 2 files changed, 58 insertions(+)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index e75fc3fda38..841948ccdf5 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,2 +1,3 @@
 DIST baikal-0.5.2.zip 3426025 BLAKE2B 
ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922
 SHA512 
58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
 DIST baikal-0.6.0.zip 3432758 BLAKE2B 
db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104
 SHA512 
75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
+DIST baikal-0.6.1.zip 3437686 BLAKE2B 
f28d3a63166a73571116759df3662c2b19c2bcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00
 SHA512 
d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38

diff --git a/www-apps/baikal/baikal-0.6.1.ebuild 
b/www-apps/baikal/baikal-0.6.1.ebuild
new file mode 100644
index 000..60941c03651
--- /dev/null
+++ b/www-apps/baikal/baikal-0.6.1.ebuild
@@ -0,0 +1,57 @@
+# 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="http://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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2019-10-20 Thread Fabian Groffen
commit: 2a6019abe493cac8ff3fe7e58eb044ff4ada4934
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Oct 20 14:13:27 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Oct 20 14:13:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6019ab

www-apps/baikal: remove old

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest|  1 -
 www-apps/baikal/baikal-0.4.6.ebuild | 57 -
 2 files changed, 58 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 537e3c0d0cc..e75fc3fda38 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,2 @@
-DIST baikal-0.4.6.zip 3288478 BLAKE2B 
e841c405e59808411999475431e79945a00f2de33228d6a46812acca03b742c1c23349c59d6501b0a1b39587030047682fbc92ead54565766f81a19ee76efdc0
 SHA512 
8cb4141deb4233858764e6bd0eb44691c5e31677dd6dde09e8249675a331115af8bbcf181c4371338165a0ef40f894dfc4ed0502b46a6bc8387924f6a65725a1
 DIST baikal-0.5.2.zip 3426025 BLAKE2B 
ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922
 SHA512 
58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
 DIST baikal-0.6.0.zip 3432758 BLAKE2B 
db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104
 SHA512 
75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905

diff --git a/www-apps/baikal/baikal-0.4.6.ebuild 
b/www-apps/baikal/baikal-0.4.6.ebuild
deleted file mode 100644
index d56d16567fb..000
--- a/www-apps/baikal/baikal-0.4.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://sabre.io/baikal/";
-SRC_URI="https://github.com/fruux/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-5.5[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  || die "dodoc failed"
-
-   einfo "Installing web files"
-   insinto "${MY_HTDOCSDIR}"
-   doins -r html/* html/.htaccess Core vendor || die "doins failed"
-
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2019-10-20 Thread Fabian Groffen
commit: 9e3cb9c9bea1e0d8bf1b60409b52c31680574f8b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Oct 20 14:10:47 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Oct 20 14:13:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3cb9c9

www-apps/baikal: add app-arch/unzip to DEPEND for SRC_URI

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/baikal-0.4.6.ebuild | 3 ++-
 www-apps/baikal/baikal-0.5.2.ebuild | 1 +
 www-apps/baikal/baikal-0.6.0.ebuild | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/www-apps/baikal/baikal-0.4.6.ebuild 
b/www-apps/baikal/baikal-0.4.6.ebuild
index 70a40f4bbc7..d56d16567fb 100644
--- a/www-apps/baikal/baikal-0.4.6.ebuild
+++ b/www-apps/baikal/baikal-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
+DEPEND="app-arch/unzip"
 
RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite )

diff --git a/www-apps/baikal/baikal-0.5.2.ebuild 
b/www-apps/baikal/baikal-0.5.2.ebuild
index d3948e73b41..a1de2542220 100644
--- a/www-apps/baikal/baikal-0.5.2.ebuild
+++ b/www-apps/baikal/baikal-0.5.2.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
+DEPEND="app-arch/unzip"
 
RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite )

diff --git a/www-apps/baikal/baikal-0.6.0.ebuild 
b/www-apps/baikal/baikal-0.6.0.ebuild
index 798bd5299fd..7984fe26d1e 100644
--- a/www-apps/baikal/baikal-0.6.0.ebuild
+++ b/www-apps/baikal/baikal-0.6.0.ebuild
@@ -14,6 +14,7 @@ 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 )



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2019-10-20 Thread Fabian Groffen
commit: 895b7734de88cdaaa0f95d1ec0b207589d957003
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Oct 20 11:07:34 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Oct 20 11:07:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=895b7734

www-apps/baikal: version bump to v0.6.0

Closes: https://bugs.gentoo.org/695974
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 www-apps/baikal/Manifest|  1 +
 www-apps/baikal/baikal-0.6.0.ebuild | 56 +
 2 files changed, 57 insertions(+)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 1429520dd25..537e3c0d0cc 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,2 +1,3 @@
 DIST baikal-0.4.6.zip 3288478 BLAKE2B 
e841c405e59808411999475431e79945a00f2de33228d6a46812acca03b742c1c23349c59d6501b0a1b39587030047682fbc92ead54565766f81a19ee76efdc0
 SHA512 
8cb4141deb4233858764e6bd0eb44691c5e31677dd6dde09e8249675a331115af8bbcf181c4371338165a0ef40f894dfc4ed0502b46a6bc8387924f6a65725a1
 DIST baikal-0.5.2.zip 3426025 BLAKE2B 
ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922
 SHA512 
58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
+DIST baikal-0.6.0.zip 3432758 BLAKE2B 
db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104
 SHA512 
75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905

diff --git a/www-apps/baikal/baikal-0.6.0.ebuild 
b/www-apps/baikal/baikal-0.6.0.ebuild
new file mode 100644
index 000..798bd5299fd
--- /dev/null
+++ b/www-apps/baikal/baikal-0.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://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 )"
+
+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  || die "dodoc failed"
+
+   einfo "Installing web files"
+   insinto "${MY_HTDOCSDIR}"
+   doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2019-04-28 Thread Fabian Groffen
commit: 908cf5b080d4707c6cac34c8dfa8f0ca3838bca4
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Apr 28 13:04:20 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Apr 28 13:04:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908cf5b0

www-apps/baikal: version bump to v0.5.2

Closes: https://bugs.gentoo.org/684168
Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 www-apps/baikal/Manifest|  1 +
 www-apps/baikal/baikal-0.5.2.ebuild | 56 +
 2 files changed, 57 insertions(+)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index cbef3174258..1429520dd25 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1 +1,2 @@
 DIST baikal-0.4.6.zip 3288478 BLAKE2B 
e841c405e59808411999475431e79945a00f2de33228d6a46812acca03b742c1c23349c59d6501b0a1b39587030047682fbc92ead54565766f81a19ee76efdc0
 SHA512 
8cb4141deb4233858764e6bd0eb44691c5e31677dd6dde09e8249675a331115af8bbcf181c4371338165a0ef40f894dfc4ed0502b46a6bc8387924f6a65725a1
+DIST baikal-0.5.2.zip 3426025 BLAKE2B 
ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922
 SHA512 
58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63

diff --git a/www-apps/baikal/baikal-0.5.2.ebuild 
b/www-apps/baikal/baikal-0.5.2.ebuild
new file mode 100644
index 000..d3948e73b41
--- /dev/null
+++ b/www-apps/baikal/baikal-0.5.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://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 )"
+
+RDEPEND=">=dev-lang/php-5.5[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  || die "dodoc failed"
+
+   einfo "Installing web files"
+   insinto "${MY_HTDOCSDIR}"
+   doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2018-03-20 Thread Fabian Groffen
commit: 234aec9875208e554707416c18e69002dc0749b7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Mar 20 19:47:54 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Mar 20 19:48:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234aec98

www-apps/baikal: drop old, bug #650924

Closes: https://bugs.gentoo.org/650924
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-apps/baikal/Manifest|  3 --
 www-apps/baikal/baikal-0.2.7.ebuild | 55 
 www-apps/baikal/baikal-0.3.5.ebuild | 56 -
 www-apps/baikal/baikal-0.4.4.ebuild | 56 -
 www-apps/baikal/baikal-0.4.6.ebuild |  4 +--
 5 files changed, 2 insertions(+), 172 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index cf8f402ecb6..cbef3174258 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,4 +1 @@
-DIST baikal-0.3.5.zip 3282401 BLAKE2B 
7b44e4b888e2689bab8d64dbefe85ade742703001b781dc9d65f7c83763c14de7df5c0c47d4a9a003948638338b7c82edd3c3ee3cd5bd4d67580252e0a682558
 SHA512 
b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d
-DIST baikal-0.4.4.zip 3285109 BLAKE2B 
2d880cf9432c803f228304cb92922234ce5c6da67bb383595e93b8880bee5ce08c96331bfbccd4332b8e3cc651487ae14606f053b7d05148c0a6505719d99e72
 SHA512 
3617b5dffddf074a30c6a463b3074c5dc33bbb22d53c3ace4bb705b83a778beed40e3fd5978ebd2019aeed4fdeb836217d18fcbcebb8de309c047dcab92e2d11
 DIST baikal-0.4.6.zip 3288478 BLAKE2B 
e841c405e59808411999475431e79945a00f2de33228d6a46812acca03b742c1c23349c59d6501b0a1b39587030047682fbc92ead54565766f81a19ee76efdc0
 SHA512 
8cb4141deb4233858764e6bd0eb44691c5e31677dd6dde09e8249675a331115af8bbcf181c4371338165a0ef40f894dfc4ed0502b46a6bc8387924f6a65725a1
-DIST baikal-regular-0.2.7.tgz 2273699 BLAKE2B 
8394939d578cf5b714f20f0fc26d9807e0b23a717dc9b61230606f466e7365132abdcef6ef9fe80de1aa9c192eb94122f317c2b810979df4f2c523e410e05650
 SHA512 
261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e3a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f

diff --git a/www-apps/baikal/baikal-0.2.7.ebuild 
b/www-apps/baikal/baikal-0.2.7.ebuild
deleted file mode 100644
index 6d36fb9754d..000
--- a/www-apps/baikal/baikal-0.2.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://baikal-server.com/";
-SRC_URI="http://baikal-server.com/get/${PN}-regular-${PV}.tgz";
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-RDEPEND=">=dev-lang/php-5.3[ctype,filter,pdo,session,xml,mysql?,sqlite?]
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite )
-   virtual/httpd-php"
-
-S=${WORKDIR}/${PN}-regular
-
-src_install() {
-   webapp_src_preinst
-
-   dodoc *.md  || die "dodoc failed"
-
-   einfo "Installing web files"
-   insinto "${MY_HTDOCSDIR}"
-   doins -r html/* html/.htaccess Core vendor || die "doins failed"
-
-   einfo "Setting up container for configuration"
-   insinto /etc/${PN}
-   doins Specific/.htaccess || die "doins failed"
-
-   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}
-   else
-   einfo "/etc/${PN} must be owned by the webserver user for 
baikal"
-   fi
-}

diff --git a/www-apps/baikal/baikal-0.3.5.ebuild 
b/www-apps/baikal/baikal-0.3.5.ebuild
deleted file mode 100644
index 8e83aa8754e..000
--- a/www-apps/baikal/baikal-0.3.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://sabre.io/baikal/";
-SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip";
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite )
-   virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-   webapp_src_preinst
-
-   dodoc *.md  || die "dodoc 

[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/files/

2017-02-11 Thread Fabian Groffen
commit: 7e787625fe8c610de6fd370a564fea8900bcbf7a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Feb 11 09:11:49 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Feb 11 09:11:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e787625

www-apps/baikal: turn postinst into flat ASCII file, bug #608552

Package-Manager: portage-2.3.3

 www-apps/baikal/files/postinstall-en.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/baikal/files/postinstall-en.txt 
b/www-apps/baikal/files/postinstall-en.txt
index 4f1ed823e0..e6a11275dc 100644
--- a/www-apps/baikal/files/postinstall-en.txt
+++ b/www-apps/baikal/files/postinstall-en.txt
@@ -1,5 +1,5 @@
-In order to setup baïkal:
+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 baïkal, you have to follow the setup instructions
+To upgrade baikal, you have to follow the setup instructions
 If you're upgrading from 0.2.7, see http://sabre.io/baikal/upgrade/



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2016-12-05 Thread Fabian Groffen
commit: 66d585fe1a48cef3058b9941a66f9773eb5f9ece
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec  5 20:17:46 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec  5 20:18:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d585fe

www-apps/baikal: version bump to v0.4.6, bug #601168

Package-Manager: portage-2.3.0

 www-apps/baikal/Manifest   |  2 +-
 .../{baikal-0.2.4.ebuild => baikal-0.4.6.ebuild}   | 23 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index f297bba..28365d7 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,4 +1,4 @@
 DIST baikal-0.3.5.zip 3282401 SHA256 
a3da3ed6d668b5ea9c2c83a231b5cfe827d25d4f45991554e27c3b277446d728 SHA512 
b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d
 WHIRLPOOL 
f1a9e1cd9512b6e6aa89449a341c8da09b36f24b67462e44fe2a9ec5b7843a9b8aaf6cf89b645c668e8e14fa2432c84737e6eb40f136ca11929d7617e2d2cf3a
 DIST baikal-0.4.4.zip 3285109 SHA256 
cced612353862bce532ed458eda0675b5e1e5790f92969bf13992c6567943efc SHA512 
3617b5dffddf074a30c6a463b3074c5dc33bbb22d53c3ace4bb705b83a778beed40e3fd5978ebd2019aeed4fdeb836217d18fcbcebb8de309c047dcab92e2d11
 WHIRLPOOL 
c266d47d043f5bc61a9c75b77b5287ec4cfb13163f1eecd124c1e5bfb3f2b91e18523a3e8e344044c2bd8053f3e4044505dc21b4f875942e4136325be0bcd1af
-DIST baikal-regular-0.2.4.tgz 868606 SHA256 
5a8a57323d3662e167c8b45b5d10748139be94f54d4cc440aca8aff0159f9678 SHA512 
84ac92a9fc0da108a7a56972a6ec4f08bdd5223c4052589db2cbe030093eeb250e5df769a02cd86b74e92c6c56601e1df1f1d422e3a9bc1fc958931f93a0d6ba
 WHIRLPOOL 
010f4da3c1bb3cf08c1567f80843c44877f2a46a2d0a86258cb903bfc9e7c08da7afeae69e93c524a178ebf2cb89ab35579485349e06e52619b34ca163e09b05
+DIST baikal-0.4.6.zip 3288478 SHA256 
946e8e4161f7ef84be42430b6e9d3bb7dd4bbbe241b409be208c14447d7aa7a6 SHA512 
8cb4141deb4233858764e6bd0eb44691c5e31677dd6dde09e8249675a331115af8bbcf181c4371338165a0ef40f894dfc4ed0502b46a6bc8387924f6a65725a1
 WHIRLPOOL 
dd62913f6366bf09a858891b9d720123266cd816744312fe1c895cabae4851794d55df2720c79298c7a7071700b4f51e1f0b0b18db6fa7a21b833e9782e52c63
 DIST baikal-regular-0.2.7.tgz 2273699 SHA256 
268daeec96b9f1bbfee0c16398ae213abfe827c97ec487179985828b6267359f SHA512 
261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e3a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f
 WHIRLPOOL 
bf3e750c9cb5e9e372794e24516e8acb6d43abe1e76d30e3033994e617082f62bef87f5b33363937818ccb1ac35cd37d59dc7caab42356206be37967d284b8f0

diff --git a/www-apps/baikal/baikal-0.2.4.ebuild 
b/www-apps/baikal/baikal-0.4.6.ebuild
similarity index 59%
rename from www-apps/baikal/baikal-0.2.4.ebuild
rename to www-apps/baikal/baikal-0.4.6.ebuild
index 7156c4a..db761d9 100644
--- a/www-apps/baikal/baikal-0.2.4.ebuild
+++ b/www-apps/baikal/baikal-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,20 +7,20 @@ EAPI="5"
 inherit webapp
 
 DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://baikal-server.com/";
-SRC_URI="http://baikal-server.com/get/${PN}-regular-${PV}.tgz";
+HOMEPAGE="http://sabre.io/baikal/";
+SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip";
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
-RDEPEND=">=dev-lang/php-5.3[pdo,xml,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite )
virtual/httpd-php"
 
-S=${WORKDIR}/${PN}-regular
+S=${WORKDIR}/${PN}
 
 src_install() {
webapp_src_preinst
@@ -29,11 +29,10 @@ src_install() {
 
einfo "Installing web files"
insinto "${MY_HTDOCSDIR}"
-   doins -r html/* html/.htaccess Core || die "doins failed"
+   doins -r html/* html/.htaccess Core vendor || die "doins failed"
 
einfo "Setting up container for configuration"
insinto /etc/${PN}
-   doins Specific/.htaccess || die "doins failed"
 
einfo "Fixing symlinks"
local link target
@@ -48,5 +47,11 @@ src_install() {
webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
webapp_src_install
 
-   fowners -R apache:apache /etc/${PN}
+   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
 }



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2016-05-24 Thread Fabian Groffen
commit: 1c69aa95f510ba07a0a98e2d3182012ad78a1cb2
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue May 24 08:46:04 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue May 24 08:46:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c69aa95

www-apps/baikal: add USE=json dep to php, thanks Sebastian in bug #583080

Package-Manager: portage-2.2.28

 www-apps/baikal/baikal-0.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/baikal/baikal-0.4.4.ebuild 
b/www-apps/baikal/baikal-0.4.4.ebuild
index b58484c..db761d9 100644
--- a/www-apps/baikal/baikal-0.4.4.ebuild
+++ b/www-apps/baikal/baikal-0.4.4.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite )
virtual/httpd-php"



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2016-04-24 Thread Fabian Groffen
commit: 03b027956568aaa06473641eb8b0c75d94a90ef3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Apr 25 04:57:09 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Apr 25 04:57:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b02795

www-apps/baikal: need USE=xmlwriter on php as well for 0.4.4, thanks Frank 
Steinmetzger in bug #521848

Package-Manager: portage-2.2.26

 www-apps/baikal/baikal-0.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/baikal/baikal-0.4.4.ebuild 
b/www-apps/baikal/baikal-0.4.4.ebuild
index ab0ae77..b58484c 100644
--- a/www-apps/baikal/baikal-0.4.4.ebuild
+++ b/www-apps/baikal/baikal-0.4.4.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite )
virtual/httpd-php"



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2016-04-11 Thread Fabian Groffen
commit: 014a16ef7bf8902d25bf65d37b49217d7adbfa7f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Apr 11 16:59:35 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Apr 11 17:00:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=014a16ef

www-apps/baikal: version bump to 0.4.4, bug #579530

Package-Manager: portage-2.2.26

 www-apps/baikal/Manifest|  1 +
 www-apps/baikal/baikal-0.4.4.ebuild | 57 +
 2 files changed, 58 insertions(+)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 745a437..f297bba 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,4 @@
 DIST baikal-0.3.5.zip 3282401 SHA256 
a3da3ed6d668b5ea9c2c83a231b5cfe827d25d4f45991554e27c3b277446d728 SHA512 
b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d
 WHIRLPOOL 
f1a9e1cd9512b6e6aa89449a341c8da09b36f24b67462e44fe2a9ec5b7843a9b8aaf6cf89b645c668e8e14fa2432c84737e6eb40f136ca11929d7617e2d2cf3a
+DIST baikal-0.4.4.zip 3285109 SHA256 
cced612353862bce532ed458eda0675b5e1e5790f92969bf13992c6567943efc SHA512 
3617b5dffddf074a30c6a463b3074c5dc33bbb22d53c3ace4bb705b83a778beed40e3fd5978ebd2019aeed4fdeb836217d18fcbcebb8de309c047dcab92e2d11
 WHIRLPOOL 
c266d47d043f5bc61a9c75b77b5287ec4cfb13163f1eecd124c1e5bfb3f2b91e18523a3e8e344044c2bd8053f3e4044505dc21b4f875942e4136325be0bcd1af
 DIST baikal-regular-0.2.4.tgz 868606 SHA256 
5a8a57323d3662e167c8b45b5d10748139be94f54d4cc440aca8aff0159f9678 SHA512 
84ac92a9fc0da108a7a56972a6ec4f08bdd5223c4052589db2cbe030093eeb250e5df769a02cd86b74e92c6c56601e1df1f1d422e3a9bc1fc958931f93a0d6ba
 WHIRLPOOL 
010f4da3c1bb3cf08c1567f80843c44877f2a46a2d0a86258cb903bfc9e7c08da7afeae69e93c524a178ebf2cb89ab35579485349e06e52619b34ca163e09b05
 DIST baikal-regular-0.2.7.tgz 2273699 SHA256 
268daeec96b9f1bbfee0c16398ae213abfe827c97ec487179985828b6267359f SHA512 
261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e3a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f
 WHIRLPOOL 
bf3e750c9cb5e9e372794e24516e8acb6d43abe1e76d30e3033994e617082f62bef87f5b33363937818ccb1ac35cd37d59dc7caab42356206be37967d284b8f0

diff --git a/www-apps/baikal/baikal-0.4.4.ebuild 
b/www-apps/baikal/baikal-0.4.4.ebuild
new file mode 100644
index 000..ab0ae77
--- /dev/null
+++ b/www-apps/baikal/baikal-0.4.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://sabre.io/baikal/";
+SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip";
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite )
+   virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+   webapp_src_preinst
+
+   dodoc *.md  || die "dodoc failed"
+
+   einfo "Installing web files"
+   insinto "${MY_HTDOCSDIR}"
+   doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/

2016-03-13 Thread Markus Meier
commit: c1c2f52881f6b9dd53a31fc2d466aad425a788d0
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Mar 13 21:12:48 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Mar 13 21:12:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c2f528

www-apps/baikal: add ~arm, bug #575952

Package-Manager: portage-2.2.27
RepoMan-Options: --include-arches="arm"

 www-apps/baikal/baikal-0.3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/baikal/baikal-0.3.5.ebuild 
b/www-apps/baikal/baikal-0.3.5.ebuild
index a52cacb..ab0ae77 100644
--- a/www-apps/baikal/baikal-0.3.5.ebuild
+++ b/www-apps/baikal/baikal-0.3.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sabre.io/baikal/";
 SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip";
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 



[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/files/, www-apps/baikal/

2016-02-25 Thread Fabian Groffen
commit: cc4413124c89fd482910478c3161d77eab38d104
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Feb 25 20:14:38 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Feb 25 20:15:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc441312

www-apps/baikal: version bump by Perfect Gentleman in bug #575082

Package-Manager: portage-2.2.26

 www-apps/baikal/Manifest |  1 +
 www-apps/baikal/baikal-0.3.5.ebuild  | 57 
 www-apps/baikal/files/postinstall-en.txt |  1 +
 3 files changed, 59 insertions(+)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index a02314e..745a437 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,2 +1,3 @@
+DIST baikal-0.3.5.zip 3282401 SHA256 
a3da3ed6d668b5ea9c2c83a231b5cfe827d25d4f45991554e27c3b277446d728 SHA512 
b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d
 WHIRLPOOL 
f1a9e1cd9512b6e6aa89449a341c8da09b36f24b67462e44fe2a9ec5b7843a9b8aaf6cf89b645c668e8e14fa2432c84737e6eb40f136ca11929d7617e2d2cf3a
 DIST baikal-regular-0.2.4.tgz 868606 SHA256 
5a8a57323d3662e167c8b45b5d10748139be94f54d4cc440aca8aff0159f9678 SHA512 
84ac92a9fc0da108a7a56972a6ec4f08bdd5223c4052589db2cbe030093eeb250e5df769a02cd86b74e92c6c56601e1df1f1d422e3a9bc1fc958931f93a0d6ba
 WHIRLPOOL 
010f4da3c1bb3cf08c1567f80843c44877f2a46a2d0a86258cb903bfc9e7c08da7afeae69e93c524a178ebf2cb89ab35579485349e06e52619b34ca163e09b05
 DIST baikal-regular-0.2.7.tgz 2273699 SHA256 
268daeec96b9f1bbfee0c16398ae213abfe827c97ec487179985828b6267359f SHA512 
261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e3a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f
 WHIRLPOOL 
bf3e750c9cb5e9e372794e24516e8acb6d43abe1e76d30e3033994e617082f62bef87f5b33363937818ccb1ac35cd37d59dc7caab42356206be37967d284b8f0

diff --git a/www-apps/baikal/baikal-0.3.5.ebuild 
b/www-apps/baikal/baikal-0.3.5.ebuild
new file mode 100644
index 000..a52cacb
--- /dev/null
+++ b/www-apps/baikal/baikal-0.3.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://sabre.io/baikal/";
+SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip";
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite )
+   virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+   webapp_src_preinst
+
+   dodoc *.md  || die "dodoc failed"
+
+   einfo "Installing web files"
+   insinto "${MY_HTDOCSDIR}"
+   doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+   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/files/postinstall-en.txt 
b/www-apps/baikal/files/postinstall-en.txt
index aafca85..4f1ed82 100644
--- a/www-apps/baikal/files/postinstall-en.txt
+++ b/www-apps/baikal/files/postinstall-en.txt
@@ -2,3 +2,4 @@ In order to setup baïkal:
 - create /etc/${PN}/ENABLE_INSTALL owner apache:apache
 - point your browser at the instal's URL and follow the setup
 To upgrade baïkal, you have to follow the setup instructions
+If you're upgrading from 0.2.7, see http://sabre.io/baikal/upgrade/