summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-08-17 14:07:42 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-08-17 14:07:42 +0200
commiteed37f8bca645a01f013d2b473a77c61eb8c925c (patch)
treef80e944342cf99cc24227872af14446888d89c01
parent9414fda37e796e3d8620219f39d7158fb25b0c4a (diff)
downloadkde-eed37f8bca645a01f013d2b473a77c61eb8c925c.tar.gz
kde-eed37f8bca645a01f013d2b473a77c61eb8c925c.tar.bz2
kde-eed37f8bca645a01f013d2b473a77c61eb8c925c.zip
kde-apps/akonadi: Re-add USE=sqlite for reverse deps
Gentoo-bug: 627992 Package-Manager: Portage-2.3.8, Repoman-2.3.3
-rw-r--r--kde-apps/akonadi/akonadi-17.08.0.ebuild20
-rw-r--r--kde-apps/akonadi/akonadi-17.08.49.9999.ebuild20
-rw-r--r--kde-apps/akonadi/akonadi-9999.ebuild20
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 c11ecfc98ef..600445c2f7b 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 575f051e834..83e59f81c19 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 575f051e834..83e59f81c19 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."
}