summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-03-02 21:54:06 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2024-03-10 00:04:30 +0100
commit59a5303f2a71097271369f8a58640896e29288b7 (patch)
tree9c7318ca373fd06787fd94dd2232fe21ab67545a
parent4057aff5f9164698f04c7d3466d80a77c9adf8ad (diff)
downloadkde-59a5303f2a71097271369f8a58640896e29288b7.tar.gz
kde-59a5303f2a71097271369f8a58640896e29288b7.tar.bz2
kde-59a5303f2a71097271369f8a58640896e29288b7.zip
kde-apps/akonadi: Drop obsolete README
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/akonadi/akonadi-24.02.49.9999.ebuild11
-rw-r--r--kde-apps/akonadi/akonadi-9999.ebuild11
-rw-r--r--kde-apps/akonadi/files/README.gentoo39
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 648dfc52b8d..27163689491 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 648dfc52b8d..27163689491 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 69bb68c1f00..00000000000
--- 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