| 1 |
commit: 626da49fc643211ccc0eefeb8c98d6cc02207698 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon May 2 14:12:06 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 2 20:36:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=626da49f |
| 7 |
|
| 8 |
kde-apps/messagelib: Block conflicting kdepim-addons |
| 9 |
|
| 10 |
Upstream fix for missing headers without kdepim-addons causes |
| 11 |
file collision with the latter, see also: |
| 12 |
|
| 13 |
https://bugs.kde.org/show_bug.cgi?id=362100 |
| 14 |
https://quickgit.kde.org/?p=messagelib.git&a=commit&h=d3c47f200c96e04785d05af9fb086bcd5a68f251 |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.27 |
| 17 |
|
| 18 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
| 19 |
|
| 20 |
kde-apps/messagelib/messagelib-9999.ebuild | 5 +++-- |
| 21 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 22 |
|
| 23 |
diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild |
| 24 |
index 642eec7..211890b 100644 |
| 25 |
--- a/kde-apps/messagelib/messagelib-9999.ebuild |
| 26 |
+++ b/kde-apps/messagelib/messagelib-9999.ebuild |
| 27 |
@@ -67,13 +67,14 @@ DEPEND="${COMMON_DEPEND} |
| 28 |
" |
| 29 |
RDEPEND="${COMMON_DEPEND} |
| 30 |
!<kde-apps/kdepim-15.08.50:5 |
| 31 |
+ !<kde-apps/kdepim-addons-16.04.50:5 |
| 32 |
+ !kde-apps/kdepim-common-libs:4 |
| 33 |
+ !kde-apps/kmail:4 |
| 34 |
!kde-apps/messagecomposer:5 |
| 35 |
!kde-apps/messagecore:5 |
| 36 |
!kde-apps/messagelist:5 |
| 37 |
!kde-apps/messageviewer:5 |
| 38 |
!kde-apps/templateparser:5 |
| 39 |
- !kde-apps/kdepim-common-libs:4 |
| 40 |
- !kde-apps/kmail:4 |
| 41 |
" |
| 42 |
|
| 43 |
# bug 579630 |
Archives