From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D28DE1382C5 for ; Sun, 4 Apr 2021 19:53:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E9E2E085A; Sun, 4 Apr 2021 19:53:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06ADCE085A for ; Sun, 4 Apr 2021 19:53:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31E3D335D7B for ; Sun, 4 Apr 2021 19:53:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C539746C for ; Sun, 4 Apr 2021 19:53:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1617565989.fe87d665b6f99bad6352d89eb9862632ba144fa0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/akonadi/akonadi-20.12.3.ebuild kde-apps/akonadi/files/README.gentoo X-VCS-Directories: kde-apps/akonadi/ kde-apps/akonadi/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fe87d665b6f99bad6352d89eb9862632ba144fa0 X-VCS-Branch: master Date: Sun, 4 Apr 2021 19:53:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d5823aa-3507-4dc5-8026-5c94f019fae8 X-Archives-Hash: 6813770ee4d64e7cf306bcb5898569ce commit: fe87d665b6f99bad6352d89eb9862632ba144fa0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 16 23:04:33 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 4 19:53:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe87d665 kde-apps/akonadi: Update IUSE=mysql instructions using readme.gentoo Provide detailed instructions for how to fix existing backends. Bug: https://bugs.gentoo.org/688746 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi/akonadi-20.12.3.ebuild | 15 +++++-------- kde-apps/akonadi/files/README.gentoo | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/kde-apps/akonadi/akonadi-20.12.3.ebuild b/kde-apps/akonadi/akonadi-20.12.3.ebuild index 6f78d4f5ff9..29372098360 100644 --- a/kde-apps/akonadi/akonadi-20.12.3.ebuild +++ b/kde-apps/akonadi/akonadi-20.12.3.ebuild @@ -9,7 +9,7 @@ KFMIN=5.75.0 QTMIN=5.15.2 VIRTUALDBUS_TEST="true" VIRTUALX_REQUIRED="test" -inherit ecm kde.org +inherit ecm kde.org readme.gentoo-r1 DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi" @@ -73,15 +73,9 @@ pkg_setup() { use postgres && DRIVER="QPSQL" use mysql && DRIVER="QMYSQL" - if use mysql && has_version ">=dev-db/mariadb-10.4"; then - ewarn "If an existing Akonadi QMYSQL database is being upgraded using" - ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail," - ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:" - ewarn " \"Cannot add or update a child row: a foreign key constraint fails\"" + if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then ewarn - ewarn "Manual steps are required to fix it, see also:" - ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)" - ewarn " https://bugs.kde.org/show_bug.cgi?id=409224" + ewarn "Attention: Make sure to read README.gentoo after install." ewarn fi @@ -116,6 +110,7 @@ EOF doins "${T}"/akonadiserverrc ecm_src_install + readme.gentoo_create_doc } pkg_postinst() { @@ -126,4 +121,6 @@ pkg_postinst() { use postgres && elog " QPSQL" use sqlite && elog " QSQLITE3" 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 new file mode 100644 index 00000000000..c778f6d1a21 --- /dev/null +++ b/kde-apps/akonadi/files/README.gentoo @@ -0,0 +1,39 @@ +Akonadi QMYSQL backends that were created using