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 5761B1396D0 for ; Sat, 12 Aug 2017 11:59:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E7C91FC03E; Sat, 12 Aug 2017 11:59:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 31C981FC03E for ; Sat, 12 Aug 2017 11:59:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C57F2341AAB for ; Sat, 12 Aug 2017 11:59:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80F8D768C for ; Sat, 12 Aug 2017 11:59:31 +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: <1502539006.7e3ac077adf9ed15424b8ceeb8dfa3421933c6d4.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-17.04.3-r1.ebuild X-VCS-Directories: kde-apps/akonadi/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7e3ac077adf9ed15424b8ceeb8dfa3421933c6d4 X-VCS-Branch: master Date: Sat, 12 Aug 2017 11:59:31 +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-Archives-Salt: 3b4f1009-ddb6-43e3-a32b-d483316dce71 X-Archives-Hash: 0429fad6937c93441d3d89fc16694320 commit: 7e3ac077adf9ed15424b8ceeb8dfa3421933c6d4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 12 11:50:41 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 12 11:56:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3ac077 kde-apps/akonadi: Drop USE=sqlite, cleanup ebuild It is broken since long ago. Upstream does not list it as supported: https://techbase.kde.org/KDE_PIM/Akonadi#Which_DBMS_does_Akonadi_use.3F Package-Manager: Portage-2.3.6, Repoman-2.3.3 kde-apps/akonadi/akonadi-17.04.3-r1.ebuild | 47 +++++++++--------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/kde-apps/akonadi/akonadi-17.04.3-r1.ebuild b/kde-apps/akonadi/akonadi-17.04.3-r1.ebuild index f7c3ff53ff2..9e5422bf714 100644 --- a/kde-apps/akonadi/akonadi-17.04.3-r1.ebuild +++ b/kde-apps/akonadi/akonadi-17.04.3-r1.ebuild @@ -11,11 +11,12 @@ inherit kde5 DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://pim.kde.org/akonadi" + KEYWORDS="~amd64 ~arm ~x86" LICENSE="LGPL-2.1+" -IUSE="+mysql postgres sqlite tools xml" +IUSE="+mysql postgres tools xml" -REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )" +REQUIRED_USE="|| ( mysql postgres ) test? ( tools )" # drop qtgui subslot operator when QT_MINIMAL >= 5.7.0 COMMON_DEPEND=" @@ -40,7 +41,6 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) x11-misc/shared-mime-info - sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) " DEPEND="${COMMON_DEPEND} @@ -64,42 +64,18 @@ RESTRICT+=" test" PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) pkg_setup() { - # Set default storage backend in order: MySQL, SQLite PostgreSQL + # Set default storage backend in order: MySQL, PostgreSQL # reverse driver check to keep the order - if use postgres; then - DRIVER="QPSQL" - AVAILABLE+=" ${DRIVER}" - fi - - if use sqlite; then - DRIVER="QSQLITE3" - AVAILABLE+=" ${DRIVER}" - fi - - if use mysql; then - DRIVER="QMYSQL" - AVAILABLE+=" ${DRIVER}" - fi - - # Notify about MySQL is recommend by upstream - if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then - ewarn - ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" - ewarn "user configuration. This is the backend recommended by KDE upstream." - ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" - ewarn "backend anymore." - ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." - ewarn "Available drivers are:${AVAILABLE}" - ewarn - fi + use postgres && DRIVER="QPSQL" + use mysql && DRIVER="QMYSQL" + kde5_pkg_setup } src_configure() { local mycmakeargs=( - -DAKONADI_BUILD_QSQLITE=$(usex sqlite) + -DAKONADI_BUILD_QSQLITE=OFF -DBUILD_TOOLS=$(usex tools) $(cmake-utils_use_find_package xml LibXml2) - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ) kde5_src_configure @@ -118,7 +94,10 @@ EOF } pkg_postinst() { + kde5_pkg_postinst + elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc." + elog "Available drivers are:" + use postgres && elog " QPSQL" + use mysql && elog " QMYSQL" elog "${DRIVER} has been set as your default akonadi storage backend." - elog "You can override it in your ~/.config/akonadi/akonadiserverrc." - elog "Available drivers are: ${AVAILABLE}" }