summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-05-01 16:05:53 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-05-01 16:05:53 +0200
commit1799b8fd29a3d6fdfea87b210897ce86c6a1936a (patch)
treea03aa940d9bf50351daab4082117ff6fb939c814 /profiles
parentnet-analyzer/nrpe: remove unused version 2.15-r2. (diff)
downloadgentoo-1799b8fd29a3d6fdfea87b210897ce86c6a1936a.tar.gz
gentoo-1799b8fd29a3d6fdfea87b210897ce86c6a1936a.tar.bz2
gentoo-1799b8fd29a3d6fdfea87b210897ce86c6a1936a.zip
profiles: Address media-sound/amarok:4 vs. kde-apps/audiocd-kio:5
Drop obsolete line.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/targets/desktop/plasma/package.use4
1 files changed, 3 insertions, 1 deletions
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 501a2e8b3172..301b52f18d1a 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -59,9 +59,11 @@ media-libs/phonon designer
# Required by dev-qt/qtwebengine
media-libs/libvpx svc
+# Conflicts with kde-apps/audiocd-kio:5
+media-sound/amarok -cdda
+
# Allow certain KDE 4 components to be coinstalled with Plasma 5
kde-apps/solid-runtime -bluetooth
-kde-frameworks/baloo minimal
sys-auth/polkit-kde-agent minimal
# FIXME: unnecessary REQUIRED_USE ^^ ( qt4 qt5 )