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

[Andreas Sturmlechner]

commit:     9394cad8a5f40da7595998868f4bbae6b4f9f97d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 13:27:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 15:50:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9394cad8

kde-apps/akonadi: Depend on fixed dev-qt/qtsql-5.7.1-r1

Gentoo-bug: 626464
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 kde-apps/akonadi/akonadi-17.08.49.9999.ebuild | 7 ++-----
 kde-apps/akonadi/akonadi-9999.ebuild          | 5 +----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild 
b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
index 66799666c5..02dccca7f5 100644
--- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
        $(add_qt_dep qtdbus)
        $(add_qt_dep qtgui '' '' '5=')
        $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtsql 'mysql?,postgres?')
+       $(add_qt_dep qtsql 'mysql?,postgres?' 5.7.1-r1)
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtxml)
        x11-misc/shared-mime-info
@@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        !kde-apps/kdepim-l10n
        !kde-apps/kdepimlibs
-       mysql? (
-               !>=dev-db/mariadb-10.2
-               virtual/mysql
-       )
+       mysql? ( virtual/mysql )
        postgres? ( dev-db/postgresql )
 "
 

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild 
b/kde-apps/akonadi/akonadi-9999.ebuild
index afbf68988f..351b0deb27 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -53,10 +53,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        !kde-apps/kdepim-l10n
        !kde-apps/kdepimlibs
-       mysql? (
-               !>=dev-db/mariadb-10.2
-               virtual/mysql
-       )
+       mysql? ( virtual/mysql )
        postgres? ( dev-db/postgresql )
 "