1 |
commit: 9394cad8a5f40da7595998868f4bbae6b4f9f97d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 25 13:27:00 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 25 15:50:37 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9394cad8 |
7 |
|
8 |
kde-apps/akonadi: Depend on fixed dev-qt/qtsql-5.7.1-r1 |
9 |
|
10 |
Gentoo-bug: 626464 |
11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
12 |
|
13 |
kde-apps/akonadi/akonadi-17.08.49.9999.ebuild | 7 ++----- |
14 |
kde-apps/akonadi/akonadi-9999.ebuild | 5 +---- |
15 |
2 files changed, 3 insertions(+), 9 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild |
18 |
index 66799666c5..02dccca7f5 100644 |
19 |
--- a/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild |
20 |
+++ b/kde-apps/akonadi/akonadi-17.08.49.9999.ebuild |
21 |
@@ -37,7 +37,7 @@ COMMON_DEPEND=" |
22 |
$(add_qt_dep qtdbus) |
23 |
$(add_qt_dep qtgui '' '' '5=') |
24 |
$(add_qt_dep qtnetwork) |
25 |
- $(add_qt_dep qtsql 'mysql?,postgres?') |
26 |
+ $(add_qt_dep qtsql 'mysql?,postgres?' 5.7.1-r1) |
27 |
$(add_qt_dep qtwidgets) |
28 |
$(add_qt_dep qtxml) |
29 |
x11-misc/shared-mime-info |
30 |
@@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND} |
31 |
RDEPEND="${COMMON_DEPEND} |
32 |
!kde-apps/kdepim-l10n |
33 |
!kde-apps/kdepimlibs |
34 |
- mysql? ( |
35 |
- !>=dev-db/mariadb-10.2 |
36 |
- virtual/mysql |
37 |
- ) |
38 |
+ mysql? ( virtual/mysql ) |
39 |
postgres? ( dev-db/postgresql ) |
40 |
" |
41 |
|
42 |
|
43 |
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild |
44 |
index afbf68988f..351b0deb27 100644 |
45 |
--- a/kde-apps/akonadi/akonadi-9999.ebuild |
46 |
+++ b/kde-apps/akonadi/akonadi-9999.ebuild |
47 |
@@ -53,10 +53,7 @@ DEPEND="${COMMON_DEPEND} |
48 |
RDEPEND="${COMMON_DEPEND} |
49 |
!kde-apps/kdepim-l10n |
50 |
!kde-apps/kdepimlibs |
51 |
- mysql? ( |
52 |
- !>=dev-db/mariadb-10.2 |
53 |
- virtual/mysql |
54 |
- ) |
55 |
+ mysql? ( virtual/mysql ) |
56 |
postgres? ( dev-db/postgresql ) |
57 |
" |