From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
Date: Sat, 9 Mar 2024 23:04:41 +0000 (UTC) [thread overview]
Message-ID: <1710025470.59a5303f2a71097271369f8a58640896e29288b7.asturm@gentoo> (raw)
commit: 59a5303f2a71097271369f8a58640896e29288b7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 20:54:06 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 23:04:30 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=59a5303f
kde-apps/akonadi: Drop obsolete README
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akonadi/akonadi-24.02.49.9999.ebuild | 11 +-------
kde-apps/akonadi/akonadi-9999.ebuild | 11 +-------
kde-apps/akonadi/files/README.gentoo | 39 ---------------------------
3 files changed, 2 insertions(+), 59 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-24.02.49.9999.ebuild b/kde-apps/akonadi/akonadi-24.02.49.9999.ebuild
index 648dfc52b8..2716368949 100644
--- a/kde-apps/akonadi/akonadi-24.02.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-24.02.49.9999.ebuild
@@ -9,7 +9,7 @@ ECM_TEST="forceoptional"
KFMIN=6.0.0
QTMIN=6.6.2
VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org readme.gentoo-r1
+inherit ecm gear.kde.org
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
@@ -61,12 +61,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
- ewarn
- ewarn "Attention: Make sure to read README.gentoo after install."
- ewarn
- fi
-
ecm_pkg_setup
}
@@ -91,7 +85,6 @@ EOF
doins "${T}"/akonadiserverrc
ecm_src_install
- readme.gentoo_create_doc
}
pkg_postinst() {
@@ -102,6 +95,4 @@ pkg_postinst() {
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE"
elog "${DRIVER} has been set as your default akonadi storage backend."
- use mysql && elog
- use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
}
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 648dfc52b8..2716368949 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -9,7 +9,7 @@ ECM_TEST="forceoptional"
KFMIN=6.0.0
QTMIN=6.6.2
VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org readme.gentoo-r1
+inherit ecm gear.kde.org
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
@@ -61,12 +61,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
- ewarn
- ewarn "Attention: Make sure to read README.gentoo after install."
- ewarn
- fi
-
ecm_pkg_setup
}
@@ -91,7 +85,6 @@ EOF
doins "${T}"/akonadiserverrc
ecm_src_install
- readme.gentoo_create_doc
}
pkg_postinst() {
@@ -102,6 +95,4 @@ pkg_postinst() {
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE"
elog "${DRIVER} has been set as your default akonadi storage backend."
- use mysql && elog
- use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
}
diff --git a/kde-apps/akonadi/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo
deleted file mode 100644
index 69bb68c1f0..0000000000
--- a/kde-apps/akonadi/files/README.gentoo
+++ /dev/null
@@ -1,39 +0,0 @@
-Akonadi QMYSQL backends that were created using <dev-db/mariadb-10.5.9-r3 may
-be in need of a manual fix. Failure to do so could result in akonadi service
-to stop fetching and sending mail for KMail or any other kind of issues in PIM
-applications depending on akonadi like KOrganizer, KAddressBook etc.
-
-Note:
- - All commands that follow are to be run by a regular user.
- - They will have to be repeated for any other user of KDE PIM.
- - Use your favorite terminal.
-
- 1) Check if "mysql" system db is present:
- $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'select schema_name \
- from information_schema.schemata where schema_name = "mysql"'
-
- The output obtained should look like this:
- +-------------+
- | schema_name |
- +-------------+
- | mysql |
- +-------------+
-
- If so, then automatic DB upgrades will succeed, no further action necessary.
-
- 2) If, however, the above query returned empty, add the missing database:
- $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'create database mysql'
-
- Future MariaDB releases should upgrade without manual intervention now.
-
- 3) Optional: You may have come here with an already defunct akonadi service.
- To manually fix the akonadi MariaDB backend:
- $ mysql_upgrade --defaults-file=~/.local/share/akonadi/mysql.conf \
- -S /run/user/$(id -u)/akonadi/mysql.socket
-
- Don't forget to restart the akonadi service afterwards:
- $ akonadictl restart
-
-References:
- [1] https://bugs.gentoo.org/688746
- [2] https://bugs.kde.org/show_bug.cgi?id=409224
next reply other threads:[~2024-03-09 23:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-09 23:04 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-02-15 14:39 [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/ Andreas Sturmlechner
2019-11-17 21:54 Andreas Sturmlechner
2019-01-29 22:03 Andreas Sturmlechner
2017-01-08 10:59 Andreas Sturmlechner
2016-09-15 12:44 Michael Palimaka
2016-05-26 15:08 Michael Palimaka
2016-01-22 10:04 Michael Palimaka
2015-10-02 19:13 Michael Palimaka
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=1710025470.59a5303f2a71097271369f8a58640896e29288b7.asturm@gentoo \
--to=asturm@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