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 9BDF21396D0 for ; Thu, 17 Aug 2017 12:24:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7D84E0E61; Thu, 17 Aug 2017 12:24:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8796DE0E5E for ; Thu, 17 Aug 2017 12:24:12 +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 E4E373418D8 for ; Thu, 17 Aug 2017 12:24:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07DE578DE for ; Thu, 17 Aug 2017 12:24:09 +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: <1502971662.eed37f8bca645a01f013d2b473a77c61eb8c925c.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/akonadi/akonadi-17.08.0.ebuild kde-apps/akonadi/akonadi-17.08.49.9999.ebuild kde-apps/akonadi/akonadi-9999.ebuild X-VCS-Directories: kde-apps/akonadi/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: eed37f8bca645a01f013d2b473a77c61eb8c925c X-VCS-Branch: master Date: Thu, 17 Aug 2017 12:24:09 +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: 4c4137a9-5ce4-423d-a178-4db6c7bd9abd X-Archives-Hash: d3bdb0fd8287ca812466fe2e7ab96f21 commit: eed37f8bca645a01f013d2b473a77c61eb8c925c Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 17 12:07:42 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 17 12:07:42 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=eed37f8b kde-apps/akonadi: Re-add USE=sqlite for reverse deps Gentoo-bug: 627992 Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-apps/akonadi/akonadi-17.08.0.ebuild | 20 +++++++++++++++----- kde-apps/akonadi/akonadi-17.08.49.9999.ebuild | 20 +++++++++++++++----- kde-apps/akonadi/akonadi-9999.ebuild | 20 +++++++++++++++----- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/kde-apps/akonadi/akonadi-17.08.0.ebuild b/kde-apps/akonadi/akonadi-17.08.0.ebuild index c11ecfc98e..600445c2f7 100644 --- a/kde-apps/akonadi/akonadi-17.08.0.ebuild +++ b/kde-apps/akonadi/akonadi-17.08.0.ebuild @@ -14,9 +14,9 @@ HOMEPAGE="https://pim.kde.org/akonadi" KEYWORDS="~amd64 ~arm ~x86" LICENSE="LGPL-2.1+" -IUSE="+mysql postgres tools xml" +IUSE="+mysql postgres sqlite tools xml" -REQUIRED_USE="|| ( mysql postgres ) test? ( tools )" +REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )" # drop qtgui subslot operator when QT_MINIMAL >= 5.9.0 COMMON_DEPEND=" @@ -41,6 +41,7 @@ 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,16 +65,24 @@ RESTRICT+=" test" PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) pkg_setup() { - # Set default storage backend in order: MySQL, PostgreSQL + # Set default storage backend in order: MySQL, PostgreSQL, SQLite # reverse driver check to keep the order + use sqlite && DRIVER="QSQLITE3" use postgres && DRIVER="QPSQL" use mysql && DRIVER="QMYSQL" + + if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then + ewarn "We strongly recommend you change your Akonadi database backend to either MySQL" + ewarn "or PostgreSQL in your user configuration." + ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend." + fi + kde5_pkg_setup } src_configure() { local mycmakeargs=( - -DAKONADI_BUILD_QSQLITE=OFF + -DAKONADI_BUILD_QSQLITE=$(usex sqlite) -DBUILD_TOOLS=$(usex tools) $(cmake-utils_use_find_package xml LibXml2) ) @@ -97,7 +106,8 @@ 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" + 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/akonadi-17.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild index 575f051e83..83e59f81c1 100644 --- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild +++ b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild @@ -14,9 +14,9 @@ HOMEPAGE="https://pim.kde.org/akonadi" KEYWORDS="" LICENSE="LGPL-2.1+" -IUSE="+mysql postgres tools xml" +IUSE="+mysql postgres sqlite tools xml" -REQUIRED_USE="|| ( mysql postgres ) test? ( tools )" +REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )" # drop qtgui subslot operator when QT_MINIMAL >= 5.9.0 COMMON_DEPEND=" @@ -41,6 +41,7 @@ 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} @@ -61,16 +62,24 @@ RESTRICT+=" test" PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) pkg_setup() { - # Set default storage backend in order: MySQL, PostgreSQL + # Set default storage backend in order: MySQL, PostgreSQL, SQLite # reverse driver check to keep the order + use sqlite && DRIVER="QSQLITE3" use postgres && DRIVER="QPSQL" use mysql && DRIVER="QMYSQL" + + if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then + ewarn "We strongly recommend you change your Akonadi database backend to either MySQL" + ewarn "or PostgreSQL in your user configuration." + ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend." + fi + kde5_pkg_setup } src_configure() { local mycmakeargs=( - -DAKONADI_BUILD_QSQLITE=OFF + -DAKONADI_BUILD_QSQLITE=$(usex sqlite) -DBUILD_TOOLS=$(usex tools) $(cmake-utils_use_find_package xml LibXml2) ) @@ -94,7 +103,8 @@ 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" + 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/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild index 575f051e83..83e59f81c1 100644 --- a/kde-apps/akonadi/akonadi-9999.ebuild +++ b/kde-apps/akonadi/akonadi-9999.ebuild @@ -14,9 +14,9 @@ HOMEPAGE="https://pim.kde.org/akonadi" KEYWORDS="" LICENSE="LGPL-2.1+" -IUSE="+mysql postgres tools xml" +IUSE="+mysql postgres sqlite tools xml" -REQUIRED_USE="|| ( mysql postgres ) test? ( tools )" +REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )" # drop qtgui subslot operator when QT_MINIMAL >= 5.9.0 COMMON_DEPEND=" @@ -41,6 +41,7 @@ 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} @@ -61,16 +62,24 @@ RESTRICT+=" test" PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) pkg_setup() { - # Set default storage backend in order: MySQL, PostgreSQL + # Set default storage backend in order: MySQL, PostgreSQL, SQLite # reverse driver check to keep the order + use sqlite && DRIVER="QSQLITE3" use postgres && DRIVER="QPSQL" use mysql && DRIVER="QMYSQL" + + if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then + ewarn "We strongly recommend you change your Akonadi database backend to either MySQL" + ewarn "or PostgreSQL in your user configuration." + ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend." + fi + kde5_pkg_setup } src_configure() { local mycmakeargs=( - -DAKONADI_BUILD_QSQLITE=OFF + -DAKONADI_BUILD_QSQLITE=$(usex sqlite) -DBUILD_TOOLS=$(usex tools) $(cmake-utils_use_find_package xml LibXml2) ) @@ -94,7 +103,8 @@ 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" + use postgres && elog " QPSQL" + use sqlite && elog " QSQLITE3" elog "${DRIVER} has been set as your default akonadi storage backend." }