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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/
Date: Thu, 24 Dec 2020 08:50:13 +0000 (UTC)	[thread overview]
Message-ID: <1608799809.73702578e1d25a3ada7598e85dc9aeb6da5b0163.grobian@gentoo> (raw)

commit:     73702578e1d25a3ada7598e85dc9aeb6da5b0163
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 08:46:50 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 08:50:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73702578

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 <grobian <AT> gentoo.org>

 www-apps/baikal/Manifest                                     | 2 +-
 www-apps/baikal/baikal-0.6.1.ebuild                          | 2 +-
 www-apps/baikal/baikal-0.7.1.ebuild                          | 2 +-
 www-apps/baikal/{baikal-0.6.0.ebuild => baikal-0.7.2.ebuild} | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index f6f42ce4b17..fc5ed08bf4d 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.1.ebuild b/www-apps/baikal/baikal-0.6.1.ebuild
index b8a74120fed..ba407dd2359 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 1c55957ab51..450d0442276 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.6.0.ebuild b/www-apps/baikal/baikal-0.7.2.ebuild
similarity index 84%
rename from www-apps/baikal/baikal-0.6.0.ebuild
rename to www-apps/baikal/baikal-0.7.2.ebuild
index b8a74120fed..39d0aca079d 100644
--- a/www-apps/baikal/baikal-0.6.0.ebuild
+++ b/www-apps/baikal/baikal-0.7.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit webapp
 
@@ -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"
@@ -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

next             reply	other threads:[~2020-12-24  8:50 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-24  8:50 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-03 11:54 [gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/ Fabian Groffen
2025-05-03 11:53 Fabian Groffen
2025-01-20  7:52 Fabian Groffen
2024-05-11  8:05 Fabian Groffen
2023-05-07 15:07 Fabian Groffen
2023-05-07 15:07 Fabian Groffen
2022-11-04  5:40 Jakov Smolić
2022-01-08 19:04 Fabian Groffen
2022-01-07  9:20 Fabian Groffen
2021-01-10 22:27 Sam James
2021-01-07 15:31 Fabian Groffen
2020-04-22  7:13 Fabian Groffen
2019-10-20 14:13 Fabian Groffen
2019-10-20 14:13 Fabian Groffen
2019-10-20 11:08 Fabian Groffen
2019-04-28 13:04 Fabian Groffen
2018-03-20 19:48 Fabian Groffen
2016-12-05 20:18 Fabian Groffen
2016-05-24  8:46 Fabian Groffen
2016-04-25  4:57 Fabian Groffen
2016-04-11 17:01 Fabian Groffen
2016-03-13 21:13 Markus Meier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:f6f42ce4b1 dfblob:fc5ed08bf4 dfblob:b8a74120fe
dfblob:ba407dd235 dfblob:1c55957ab5 dfblob:450d044227 dfblob:b8a74120fe
dfblob:39d0aca079 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1608799809.73702578e1d25a3ada7598e85dc9aeb6da5b0163.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox