From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/targets/desktop/kde/
Date: Sat, 9 Jul 2016 21:27:05 +0000 (UTC) [thread overview]
Message-ID: <1468099615.7d72c36042e09aaec1758e1e09fdda4e02dfefd2.johu@gentoo> (raw)
commit: 7d72c36042e09aaec1758e1e09fdda4e02dfefd2
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jul 9 10:51:01 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> 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 <johu <AT> 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
next reply other threads:[~2016-07-09 21:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-09 21:27 Johannes Huber [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-22 18:28 [gentoo-commits] repo/gentoo:master commit in: profiles/targets/desktop/kde/ Michael Palimaka
2016-07-20 16:37 Michael Palimaka
2016-07-17 10:14 Johannes Huber
2016-07-09 14:38 Johannes Huber
2016-07-09 12:51 Johannes Huber
2016-04-16 13:49 Johannes Huber
2016-01-17 17:06 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1468099615.7d72c36042e09aaec1758e1e09fdda4e02dfefd2.johu@gentoo \
--to=johu@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox