From 7d72c36042e09aaec1758e1e09fdda4e02dfefd2 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 9 Jul 2016 12:51:01 +0200 Subject: profiles: Resolve conflicts with slot 5 in kde package.use Signed-off-by: Johannes Huber --- profiles/targets/desktop/kde/package.use | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'profiles/targets') 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 -- cgit v1.2.3-65-gdbad