From 66d585fe1a48cef3058b9941a66f9773eb5f9ece Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 5 Dec 2016 21:17:46 +0100
Subject: www-apps/baikal: version bump to v0.4.6, bug #601168

Package-Manager: portage-2.3.0
---
 www-apps/baikal/Manifest            |  2 +-
 www-apps/baikal/baikal-0.2.4.ebuild | 52 ---------------------------------
 www-apps/baikal/baikal-0.4.6.ebuild | 57 +++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 53 deletions(-)
 delete mode 100644 www-apps/baikal/baikal-0.2.4.ebuild
 create mode 100644 www-apps/baikal/baikal-0.4.6.ebuild

(limited to 'www-apps')

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index f297bba09583..28365d78ed24 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 261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e33333a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f WHIRLPOOL bf3e750c9cb5e9e372794e24516e8acb6d43abe1e76d30e3033994e617082f62bef87f5b33363937818ccb1ac35cd37d59dc7caab42356206be37967d284b8f0
diff --git a/www-apps/baikal/baikal-0.2.4.ebuild b/www-apps/baikal/baikal-0.2.4.ebuild
deleted file mode 100644
index 7156c4a51038..000000000000
--- a/www-apps/baikal/baikal-0.2.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 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://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[pdo,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 || 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
-
-	fowners -R apache:apache /etc/${PN}
-}
diff --git a/www-apps/baikal/baikal-0.4.6.ebuild b/www-apps/baikal/baikal-0.4.6.ebuild
new file mode 100644
index 000000000000..db761d9ea024
--- /dev/null
+++ b/www-apps/baikal/baikal-0.4.6.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,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
+}
-- 
cgit v1.2.3-65-gdbad