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

[Andreas Sturmlechner]

commit:     02e8b99f2426faddbe40df6554707f0200e91fa0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 16:08:20 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 16:08:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=02e8b99f

kde-apps/akonadi: Block >=dev-db/mariadb-10.2 if USE=mysql

Gentoo-bug: 626464

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

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

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