Version bump (bug #511956) and fix possibly invalid chown, bug #468508

Package-Manager: portage-HEAD/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 76 insertions, 8 deletions

diff --git a/www-apps/baikal/ChangeLog b/www-apps/baikal/ChangeLog
index 85b4b6e00c18..ae984752df9a 100644
--- a/www-apps/baikal/ChangeLog
+++ b/www-apps/baikal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/baikal
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/baikal/ChangeLog,v 1.2 2013/04/20 15:23:34 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/baikal/ChangeLog,v 1.3 2014/06/06 18:37:10 grobian Exp $
+
+*baikal-0.2.7 (06 Jun 2014)
+
+  06 Jun 2014; Fabian Groffen <grobian@gentoo.org> +baikal-0.2.7.ebuild,
+  files/postinstall-en.txt:
+  Version bump (bug #511956) and fix possibly invalid chown, bug #468508
 
   20 Apr 2013; Fabian Groffen <grobian@gentoo.org> +files/postinstall-en.txt,
   baikal-0.2.4.ebuild:
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 8158bd35f7af..aa06ea2ac34f 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX postinstall-en.txt 144 SHA256 cd1c37eb55843b269e4d018bbea4af24d0815e0961624783e6a529fe169d7c51 SHA512 50efdbfcefecdcfe6c47c25bba960af1556cf1d4b2a8feaff7e8af9a68c0a8d123ce0467430e29ff887c19e9384cdc9ce63eb31811af0d8ea7a1f2002fdcf776 WHIRLPOOL 60ecc35715278de8b3df42fc14540977c2757aeb8d55f13734a9114d7e11191e92246eb06e30f69738afd50e3ee9a03302216b0641f96682ec4532472e0fa3ca
+AUX postinstall-en.txt 206 SHA256 d7d09ed2c651acb6cfd710ece1e1f5c2eebdace6867dd4de5a9213a86859ed17 SHA512 2d9d400e46d420df161a8695ba1570ed0fa5ff3e64a27df44845361f37b59be414bad4ad3fa0cefbd947f518d9459e32ad4c075aef373e21016a65e706cffbc2 WHIRLPOOL 4b39ec133e0e77fa4cce05128daf0fcbfca1c16d54f9738a04de3c0856863f811c661fbdd3c41fdb4e05abf108d588359e01504f43fff52ad851af638adc2f6a
 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 261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e33333a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f WHIRLPOOL bf3e750c9cb5e9e372794e24516e8acb6d43abe1e76d30e3033994e617082f62bef87f5b33363937818ccb1ac35cd37d59dc7caab42356206be37967d284b8f0
 EBUILD baikal-0.2.4.ebuild 1397 SHA256 81fd9676da75c19303db96680a51a1a36131f28fe92208b4810ebac1532e1f20 SHA512 7f9f08c0a66cb159337dae87d011b6067148b0e1903f8e242d9b9ed2e20faab8389ffbb62d4c4ecf3390da78b15cf1637abef9af2138e0490f8aae0c4c673d97 WHIRLPOOL fda6c2a688e5ea14c9ac071bf62cc6b63a76f61f6df17182b1d1d3658c2528ba3f8f5381cce80a475378de92e97484304333df7de9d09bc124e105175adb57b4
-MISC ChangeLog 572 SHA256 b5b92c89dbe36f7084938a63099c908602f0218779367351104389c7d0ad76fa SHA512 69baf806cc57d4587ce69aeff98500deefe30227d1b7dd93a09dff29844fc92acdb4d2477c3692a48378b498fec8195aefe55e66988f99a3f9b43b6ce7a3c76c WHIRLPOOL 229c251eee6196f1bffc1a3d3aec4d84625ec6c0700b6dc6a42af5685f49db920926227b810c5de3dc544c1a70923f5328d32a6df8c658cb721afcba6a57d913
+EBUILD baikal-0.2.7.ebuild 1525 SHA256 6640982c9d2d4444b1243e1594d458688fc201f53d8d1bd0f1a98ffed027ced8 SHA512 791775fdc26d3ad13dbf57c970db1154dd78416f6a8babf5000696a3407a6a7c2dabc7cf01deb52751a03047c0afd835d7057fe6a98da244ca374eb9f2118921 WHIRLPOOL 7e20bd2e44d891a8593e4779adaafb48917a0be125658ccef81adcda7ad418a4761479149d0f0223a1b5677b59332537f429ba2279bc8c5aa4a0242d1c2d254c
+MISC ChangeLog 776 SHA256 56e2face52471338c79bb6c9593f385a5442ed4c17b03786353ce2b395540b3b SHA512 a53f558b712516a2397e4503c020cbd2f775db4b9026f1006a29a1548ce8802bbb0d79ffaced8c2a88bfbad23a7e433c2c3fab410c35176ae259332792022d7d WHIRLPOOL 6429781d84fdb731784748877f5ae54bb87841a3adfd1914ec2f7e1470a137bdb22472f442d579aaaff02f43bec40d293483b229c1ce1b68866c89a1233fc8ce
 MISC metadata.xml 234 SHA256 1decd69feb1804dfd01fda996933fd2cd426eb16851b72f40b30b73f5cca7762 SHA512 7af21366d273b8166d7d20a7061e5fb19bad4ece55e2631d28196fa8dd35c16fdac21e5dde36c2f71f215d6e21774d078da9ce27f7d398ec37e5bf7950b385ee WHIRLPOOL 22f8437821a129afd883769051cb4cfdd3a56590e45281f032044bfc5eb641f272f2a08f6d0c6d0b477078c1aeef506857d6ed78352a57e09862c2f04ef33709
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
+Version: GnuPG v2.0.22 (SunOS)
 
-iEYEAREIAAYFAlFysvcACgkQX3X2B8XHTokL+wCghc6MoxUjLOgTtxSDv4Yge9Gn
-U5YAoIdMc6Ds9m/j7rYCZjBtqF01MLhB
-=p1z5
+iEYEAREIAAYFAlOSClgACgkQX3X2B8XHTokzGACeOKyWUngJiDI9tzemYQuZXXp6
+8fcAn3mIur6uRTDr/yvrjCPbpv4glePI
+=X05G
 -----END PGP SIGNATURE-----
diff --git a/www-apps/baikal/baikal-0.2.7.ebuild b/www-apps/baikal/baikal-0.2.7.ebuild
new file mode 100644
index 000000000000..ccfd6708f00a
--- /dev/null
+++ b/www-apps/baikal/baikal-0.2.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/baikal/baikal-0.2.7.ebuild,v 1.1 2014/06/06 18:37:10 grobian Exp $
+
+EAPI="5"
+
+inherit depend.php 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"
+
+need_php5
+need_httpd
+
+S=${WORKDIR}/${PN}-regular
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc-php *.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/files/postinstall-en.txt b/www-apps/baikal/files/postinstall-en.txt
index 5115d56cba49..aafca857472d 100644
--- a/www-apps/baikal/files/postinstall-en.txt
+++ b/www-apps/baikal/files/postinstall-en.txt
@@ -1,3 +1,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