[gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi/

[Andreas Sturmlechner]

commit:     7e3ac077adf9ed15424b8ceeb8dfa3421933c6d4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 11:50:41 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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}"
 }