| 1 |
commit: 7d72c36042e09aaec1758e1e09fdda4e02dfefd2 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jul 9 10:51:01 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 9 21:26:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d72c360 |
| 7 |
|
| 8 |
profiles: Resolve conflicts with slot 5 in kde package.use |
| 9 |
|
| 10 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/targets/desktop/kde/package.use | 7 ++++++- |
| 13 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use |
| 16 |
index d8bc342..8edbfb3 100644 |
| 17 |
--- a/profiles/targets/desktop/kde/package.use |
| 18 |
+++ b/profiles/targets/desktop/kde/package.use |
| 19 |
@@ -1,7 +1,12 @@ |
| 20 |
-# Copyright 1999-2015 Gentoo Foundation |
| 21 |
+# Copyright 1999-2016 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
+# Resolve conflicts with slot 5 ebuilds |
| 26 |
+kde-base/baloo minimal |
| 27 |
+kde-apps/kwalletmanager:4 minimal |
| 28 |
+kde-apps/libkipi:4 minimal |
| 29 |
+ |
| 30 |
# Required by kde-base/pykde4 |
| 31 |
dev-python/PyQt4 script sql webkit |
Archives