From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB7FC1382FF for ; Sat, 9 Jul 2016 21:27:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5E6121C028; Sat, 9 Jul 2016 21:27:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F172D21C028 for ; Sat, 9 Jul 2016 21:27:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97A8A340F9F for ; Sat, 9 Jul 2016 21:27:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C46982446 for ; Sat, 9 Jul 2016 21:27:05 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1468099615.7d72c36042e09aaec1758e1e09fdda4e02dfefd2.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/targets/desktop/kde/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/targets/desktop/kde/package.use X-VCS-Directories: profiles/targets/desktop/kde/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 7d72c36042e09aaec1758e1e09fdda4e02dfefd2 X-VCS-Branch: master Date: Sat, 9 Jul 2016 21:27:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c7d5b8c1-076a-418e-84e1-8d0c6a8c702c X-Archives-Hash: e3714f7ca9de7db015c1e2340b0c8f7e commit: 7d72c36042e09aaec1758e1e09fdda4e02dfefd2 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Jul 9 10:51:01 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jul 9 21:26:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d72c360 profiles: Resolve conflicts with slot 5 in kde package.use Signed-off-by: Johannes Huber gentoo.org> profiles/targets/desktop/kde/package.use | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use index d8bc342..8edbfb3 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