commit: 9463c23c4563ece2a22a0c25fc89249354149f1b Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat May 11 08:04:38 2024 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat May 11 08:05:48 2024 +0000 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 <grobian <AT> 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..000000000000 --- 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 - - 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 }
