gentoo auto-resync : 12:05:2024 - 00:01:15

3 files changed, 3 insertions, 74 deletions

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index de1e8119606c..97b94e6a83fc 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,8 +1,6 @@
 AUX postinstall-v0.7-en.txt 465 BLAKE2B adefd05b835bd3e27cc12137da53837dabd23790afe95fcc3e55e2dc1825342e96e2709c8d268fd0ec465b72faae7b5bd0fade0cb30fd0df2d8196bd49ae1e1b SHA512 8e532a5b229181cf32cc4a254688cc564a4a2dc80db64545fba0e093fa227a186a544b4dfc79c798e7d1021c1e01b7fb5f663f5b981082a32f6e6a0f98211df2
-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
-EBUILD baikal-0.8.0.ebuild 1611 BLAKE2B 5186ee750ffc63fc21320454002dc4900ca440dab419dd5f509c0ba2145810613b76d47acc08854b1a3592663d83c0737ce4bcc0a85c03138acc53ee6fe56bb0 SHA512 f62024469f004fb6b8874a4fe48badbf6ff043b4cb608c78ca02deb95e30840eb73219672e5ffbf32a6745518f1a1d8d44cf9e96abd43e55b7a3b767eec4700a
-EBUILD baikal-0.9.1.ebuild 1618 BLAKE2B d6b1f938cee6c0a34f427cd88f531c89c762f943c8362d352741e0cbd2b9d1d9676ed19bbca8ebfe3f6e3798f04a26f09438817ce8c5a63f87bbe214bbce611f SHA512 881b6c22abefc6cbccd21dd4372f5efe0d49ece9d6b56337232678468e305c1d0afde8d1a65d4594c52c95c61d959ddaff0f495f0e19e9cd08092b230d0c8e35
+DIST baikal-0.9.5.zip 2828793 BLAKE2B bd4c2e5887a78da6e1bd94c73452a1df22a68d626572aca728758bd95553c5f79a99d47418909b339a837efff25a12ef8b3e1c041ba32b888224b04e93201206 SHA512 e544ed39047788bf001c81a44eb69a3db30a871253cb6bf12b54d5d476eaadc63d723192d41b67f2cf908a72d4c722def03d853df68b7fd464a4093e08ed0f19
 EBUILD baikal-0.9.3.ebuild 1618 BLAKE2B d6b1f938cee6c0a34f427cd88f531c89c762f943c8362d352741e0cbd2b9d1d9676ed19bbca8ebfe3f6e3798f04a26f09438817ce8c5a63f87bbe214bbce611f SHA512 881b6c22abefc6cbccd21dd4372f5efe0d49ece9d6b56337232678468e305c1d0afde8d1a65d4594c52c95c61d959ddaff0f495f0e19e9cd08092b230d0c8e35
+EBUILD baikal-0.9.5.ebuild 1437 BLAKE2B 611f090af4af6dec11200899e195c18f6776466c201e556dc8900e06fbd200a50402340711e2765f997e8992fd98438476a5deb7f784acb0deb9d33e864e89f0 SHA512 49b100198f75468502751ce8685d9850a15eb78884264f7fdf23d854a88658fcba452cdc28742ce1770156d7f8559fcbd6040ce65c9560556cdb7e636500d9e0
 MISC metadata.xml 350 BLAKE2B 54198a366fda3ab711caceec25239a8402b5ba4bdb5cfb8fd29fd88442627c26101cbebdc6fd3175a2e716dcc64bf29fa85dc21022e6b3938b8a622aa8034056 SHA512 7f8682154f1e316f5f3be2ba4fe853793906abbb389a303ec7ef6ed14ff78b356a42b89e53e2f825670fafd96fc52ed69bcc3c9d6df130e2ff0b92515da0596f
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
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
 }