From 73702578e1d25a3ada7598e85dc9aeb6da5b0163 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Thu, 24 Dec 2020 09:46:50 +0100 Subject: 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 --- www-apps/baikal/Manifest | 2 +- www-apps/baikal/baikal-0.6.0.ebuild | 57 ------------------------------------ www-apps/baikal/baikal-0.6.1.ebuild | 2 +- www-apps/baikal/baikal-0.7.1.ebuild | 2 +- www-apps/baikal/baikal-0.7.2.ebuild | 58 +++++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 60 deletions(-) delete mode 100644 www-apps/baikal/baikal-0.6.0.ebuild create mode 100644 www-apps/baikal/baikal-0.7.2.ebuild (limited to 'www-apps/baikal') diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest index f6f42ce4b17a..fc5ed08bf4d8 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 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 diff --git a/www-apps/baikal/baikal-0.6.0.ebuild b/www-apps/baikal/baikal-0.6.0.ebuild deleted file mode 100644 index b8a74120fedd..000000000000 --- a/www-apps/baikal/baikal-0.6.0.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.6.1.ebuild b/www-apps/baikal/baikal-0.6.1.ebuild index b8a74120fedd..ba407dd2359c 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 1c55957ab51e..450d04422760 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.7.2.ebuild b/www-apps/baikal/baikal-0.7.2.ebuild new file mode 100644 index 000000000000..39d0aca079d3 --- /dev/null +++ b/www-apps/baikal/baikal-0.7.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2020 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} + + 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 +} -- cgit v1.2.3-65-gdbad