[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/files/, www-apps/baikal/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     9963aede3bcd793829740832cfd1eecc1c5236f3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 08:46:02 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 08:46:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9963aede

www-apps/baikal-0.7.1: version bump

Closes: https://bugs.gentoo.org/727936
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 www-apps/baikal/Manifest                                     | 2 +-
 www-apps/baikal/{baikal-0.5.2.ebuild => baikal-0.7.1.ebuild} | 7 ++++---
 www-apps/baikal/files/postinstall-v0.7-en.txt                | 9 +++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 841948ccdf5..f6f42ce4b17 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,3 @@
-DIST baikal-0.5.2.zip 3426025 BLAKE2B ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922 SHA512 58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
 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

diff --git a/www-apps/baikal/baikal-0.5.2.ebuild b/www-apps/baikal/baikal-0.7.1.ebuild
similarity index 85%
rename from www-apps/baikal/baikal-0.5.2.ebuild
rename to www-apps/baikal/baikal-0.7.1.ebuild
index 24e74850aa4..1c55957ab51 100644
--- a/www-apps/baikal/baikal-0.5.2.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-5.5[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"
@@ -32,7 +32,7 @@ src_install() {
 	doins -r html/* html/.htaccess Core vendor
 
 	einfo "Setting up container for configuration"
-	insinto /etc/${PN}
+	dodir /etc/${PN}
 
 	einfo "Fixing symlinks"
 	local link target
@@ -42,9 +42,10 @@ src_install() {
 		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-en.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
 	webapp_src_install
 
 	if has_version www-servers/apache ; then

diff --git a/www-apps/baikal/files/postinstall-v0.7-en.txt b/www-apps/baikal/files/postinstall-v0.7-en.txt
new file mode 100644
index 00000000000..ab3ec6459f9
--- /dev/null
+++ b/www-apps/baikal/files/postinstall-v0.7-en.txt
@@ -0,0 +1,9 @@
+To install, point your browser at the installation url:
+  /admin/install
+To upgrade baikal, do the same but note that starting from version 0.7.0
+baikal now uses a yaml file instead of php config.  The installer will
+try to convert your configuration, but fail to retain your MySQL
+database config (if you use that).
+  https://github.com/sabre-io/Baikal/issues/943
+Simply edit the /etc/baikal/baikal.yaml file and add the missing values
+under the database section.