From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1251946-garchives=archives.gentoo.org@lists.gentoo.org>
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 EC1281382C5
for <garchives@archives.gentoo.org>; Tue, 16 Feb 2021 22:59:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 39B72E0824;
Tue, 16 Feb 2021 22:59:49 +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 16A5FE0824
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Feb 2021 22:59:49 +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 F36AF34142A
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Feb 2021 22:59:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E5524C8
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Feb 2021 22:59:46 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1613516357.cd228f9d66bff04c15ec5ba58f65f16d4e246aef.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi/
X-VCS-Repository: repo/gentoo
X-VCS-Files: kde-apps/akonadi/akonadi-20.12.2.ebuild kde-apps/akonadi/metadata.xml
X-VCS-Directories: kde-apps/akonadi/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: cd228f9d66bff04c15ec5ba58f65f16d4e246aef
X-VCS-Branch: master
Date: Tue, 16 Feb 2021 22:59:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1c950dff-c90f-4865-bcbe-9606b97ab307
X-Archives-Hash: dbab91776b66622b51e8a1721bb4c279
commit: cd228f9d66bff04c15ec5ba58f65f16d4e246aef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 22:59:17 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 22:59:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd228f9d
kde-apps/akonadi: Drop 20.12.2 (r0)
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akonadi/akonadi-20.12.2.ebuild | 138 --------------------------------
kde-apps/akonadi/metadata.xml | 1 -
2 files changed, 139 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-20.12.2.ebuild b/kde-apps/akonadi/akonadi-20.12.2.ebuild
deleted file mode 100644
index ec7b1bb392c..00000000000
--- a/kde-apps/akonadi/akonadi-20.12.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
-QTMIN=5.15.2
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+kaccounts +mariadb postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mariadb postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
- app-arch/xz-utils
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[postgres?]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- kaccounts? (
- >=kde-apps/kaccounts-integration-${PVCUT}:5
- net-libs/accounts-qt
- )
- mariadb? ( >=dev-qt/qtsql-${QTMIN}:5[mysql] )
- sqlite? (
- dev-db/sqlite:3
- >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
- )
- xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- dev-libs/libxslt
- test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
- mariadb? ( >=dev-db/mariadb-10.4:* )
- postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
-
-pkg_setup() {
- # Set default storage backend in order: MariaDB, PostgreSQL, SQLite
- # reverse driver check to keep the order
- use sqlite && DRIVER="QSQLITE3"
- use postgres && DRIVER="QPSQL"
- use mariadb && DRIVER="QMYSQL"
-
- if use mariadb && has_version ">=dev-db/mariadb-10.4"; then
- ewarn "If an existing Akonadi MariaDB 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\""
- 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
- fi
-
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
- ewarn "We strongly recommend you change your Akonadi database backend to"
- ewarn "either MariaDB or PostgreSQL in your user configuration."
- ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
- fi
-
- if has_version "kde-apps/akonadi[mysql]"; then
- ewarn "Due to configuration incompatibilities we are unable to provide"
- ewarn "the option to use dev-db/mysql. You must switch to dev-db/mariadb."
- ewarn " https://bugs.gentoo.org/709812"
- ewarn " https://bugs.kde.org/show_bug.cgi?id=421922"
- fi
-
- ecm_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package kaccounts AccountsQt5)
- $(cmake_use_find_package kaccounts KAccounts)
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
- -DBUILD_TOOLS=$(usex tools)
- $(cmake_use_find_package xml LibXml2)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- # Who knows, maybe it accidentally fixes our permission issues
- cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
- insinto /usr/share/config/akonadi
- doins "${T}"/akonadiserverrc
-
- ecm_src_install
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
- elog "Available drivers are:"
- use mariadb && elog " QMYSQL"
- use postgres && elog " QPSQL"
- use sqlite && elog " QSQLITE3"
- elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml
index c6b73ba5cfc..8acbee94c7a 100644
--- a/kde-apps/akonadi/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
- <flag name="mariadb">Enable support for using <pkg>dev-db/mariadb</pkg> storage backend</flag>
<flag name="tools">Install tools for developers and testing</flag>
</use>
</pkgmetadata>