summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-07-09 12:51:01 +0200
committerJohannes Huber <johu@gentoo.org>2016-07-09 23:26:55 +0200
commit7d72c36042e09aaec1758e1e09fdda4e02dfefd2 (patch)
tree0871c496e177299b9f5d77bdf47a3f7e5b755d2c /profiles
parentkde-base/kdebase-startkde: Drop obsolete (diff)
downloadgentoo-7d72c36042e09aaec1758e1e09fdda4e02dfefd2.tar.gz
gentoo-7d72c36042e09aaec1758e1e09fdda4e02dfefd2.tar.bz2
gentoo-7d72c36042e09aaec1758e1e09fdda4e02dfefd2.zip
profiles: Resolve conflicts with slot 5 in kde package.use
Signed-off-by: Johannes Huber <johu@gentoo.org>
Diffstat (limited to 'profiles')
-rw-r--r--profiles/targets/desktop/kde/package.use7
1 files changed, 6 insertions, 1 deletions
diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use
index d8bc3424bb63..8edbfb3f6c62 100644
--- a/profiles/targets/desktop/kde/package.use
+++ b/profiles/targets/desktop/kde/package.use
@@ -1,7 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Resolve conflicts with slot 5 ebuilds
+kde-base/baloo minimal
+kde-apps/kwalletmanager:4 minimal
+kde-apps/libkipi:4 minimal
+
# Required by kde-base/pykde4
dev-python/PyQt4 script sql webkit