gentoo resync : 21.06.2020

3 files changed, 16 insertions, 5 deletions

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index a59ce3e5997e..bde3b36d178e 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,8 +1,9 @@
 AUX postinstall-en.txt 272 BLAKE2B 2042cf6fbf8d98ef144d19002c3498e4e5f6238b8d135066920ee999facf14a65ba3ed1269228dedbd7f17932a894c399379c19fcf2fccf648d7a7f30b0ffb49 SHA512 4f902e053ac38e313698269decfabe750ca41e255076972eb439f7c753dba50f09879e54df09768daf643da13c81a7bcd1f9bee834da9d29e91a5be88b38c740
-DIST baikal-0.5.2.zip 3426025 BLAKE2B ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922 SHA512 58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
+AUX postinstall-v0.7-en.txt 465 BLAKE2B adefd05b835bd3e27cc12137da53837dabd23790afe95fcc3e55e2dc1825342e96e2709c8d268fd0ec465b72faae7b5bd0fade0cb30fd0df2d8196bd49ae1e1b SHA512 8e532a5b229181cf32cc4a254688cc564a4a2dc80db64545fba0e093fa227a186a544b4dfc79c798e7d1021c1e01b7fb5f663f5b981082a32f6e6a0f98211df2
 DIST baikal-0.6.0.zip 3432758 BLAKE2B db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104 SHA512 75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
 DIST baikal-0.6.1.zip 3437686 BLAKE2B f28d3a63166a73571116759df3662c2b19c2eeeebcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00 SHA512 d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
-EBUILD baikal-0.5.2.ebuild 1448 BLAKE2B c90e53da2862e36249d70f300ea406e4203953f0896b0b238e42804c8202511bee1df4533ca6f3667e78f28e53355fc89b38015a379cc846acd448f917b2ce7f SHA512 5c2ecde3efa57c267f567cf492cf9d9f5bf754998e617cc0726f6ed642e695816949d0c13d327f96ff6ea0a45e182c20a1667c2a533c20208a79e8005efc6f52
+DIST baikal-0.7.1.zip 3596673 BLAKE2B ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5 SHA512 4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
 EBUILD baikal-0.6.0.ebuild 1446 BLAKE2B 5944a7dd73429ee30975230eb49a4eb842ec4dbf538ff31e9d070d3aa31acd73c3f3ebcfc140d00bb28714316431e9c3125e8e8ae010debc9eaf7b0a1000070b SHA512 12b9b6a9d0c6135455502923e38218612344d37836d4d2a244f7092049a1e164482eace228b114fa6ab1423b0242ea712dbfbc046fd73254c2582373a5206e3f
 EBUILD baikal-0.6.1.ebuild 1446 BLAKE2B 5944a7dd73429ee30975230eb49a4eb842ec4dbf538ff31e9d070d3aa31acd73c3f3ebcfc140d00bb28714316431e9c3125e8e8ae010debc9eaf7b0a1000070b SHA512 12b9b6a9d0c6135455502923e38218612344d37836d4d2a244f7092049a1e164482eace228b114fa6ab1423b0242ea712dbfbc046fd73254c2582373a5206e3f
+EBUILD baikal-0.7.1.ebuild 1492 BLAKE2B 9114046fed804f9916f082c6e6a3ece77240a5eba18ea702496ddf5fa94b09f18e60225b1da01eca07dfcd192e4d615e2cf6d5d6431550918353cbc1efdc2ec9 SHA512 a3cf22f7b00d6747bce3f9c0e3cca38f24d70acb2dc79a77af3d1fd539c4e4c27030d59cfce58ae7aa3f75af7f4c074a7c05a32c7b0f91a9b4e62d035f71200f
 MISC metadata.xml 325 BLAKE2B 92c24f0b14c94c6666fe915eda815354af8f73d3f829ff414afcd4ff49b775191ee79ec9000718a795799060ccca8f10acf5ca27d861943ee5ac5c5a34d69ce0 SHA512 2b6f9ba13bbc4821f79703ba0fe5829b4ec30817b9571c05698d65cadbd52444bd3dcff42f0807f4fcdfc9269db6edb858bb0301a50546b0741929030bc196c9
diff --git a/www-apps/baikal/baikal-0.5.2.ebuild b/www-apps/baikal/baikal-0.7.1.ebuild
index 24e74850aa4a..1c55957ab51e 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 000000000000..ab3ec6459f9b
--- /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.