Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/targets/desktop/plasma/
Date: Mon, 01 May 2017 14:09:40
Message-Id: 1493647553.1799b8fd29a3d6fdfea87b210897ce86c6a1936a.asturm@gentoo
1 commit: 1799b8fd29a3d6fdfea87b210897ce86c6a1936a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 1 14:05:53 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon May 1 14:05:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1799b8fd
7
8 profiles: Address media-sound/amarok:4 vs. kde-apps/audiocd-kio:5
9
10 Drop obsolete line.
11
12 profiles/targets/desktop/plasma/package.use | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15 diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
16 index 501a2e8b317..301b52f18d1 100644
17 --- a/profiles/targets/desktop/plasma/package.use
18 +++ b/profiles/targets/desktop/plasma/package.use
19 @@ -59,9 +59,11 @@ media-libs/phonon designer
20 # Required by dev-qt/qtwebengine
21 media-libs/libvpx svc
22
23 +# Conflicts with kde-apps/audiocd-kio:5
24 +media-sound/amarok -cdda
25 +
26 # Allow certain KDE 4 components to be coinstalled with Plasma 5
27 kde-apps/solid-runtime -bluetooth
28 -kde-frameworks/baloo minimal
29 sys-auth/polkit-kde-agent minimal
30
31 # FIXME: unnecessary REQUIRED_USE ^^ ( qt4 qt5 )