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 6CC10139694 for ; Mon, 1 May 2017 14:09:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB1E6E0D46; Mon, 1 May 2017 14:09:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 84CE5E0D46 for ; Mon, 1 May 2017 14:09:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 495583413B7 for ; Mon, 1 May 2017 14:09:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B8837442 for ; Mon, 1 May 2017 14:09:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1493647553.1799b8fd29a3d6fdfea87b210897ce86c6a1936a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/targets/desktop/plasma/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/targets/desktop/plasma/package.use X-VCS-Directories: profiles/targets/desktop/plasma/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1799b8fd29a3d6fdfea87b210897ce86c6a1936a X-VCS-Branch: master Date: Mon, 1 May 2017 14:09:36 +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: 72914fb0-c6bf-4772-9b5e-b2700e4ff555 X-Archives-Hash: 6058bec62353df9d3cf0cb29b3fb7d2c commit: 1799b8fd29a3d6fdfea87b210897ce86c6a1936a Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 1 14:05:53 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 1 14:05:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1799b8fd profiles: Address media-sound/amarok:4 vs. kde-apps/audiocd-kio:5 Drop obsolete line. profiles/targets/desktop/plasma/package.use | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index 501a2e8b317..301b52f18d1 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 )