From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B01D7139522 for ; Wed, 28 Jan 2015 19:35:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95B9CE0D53; Wed, 28 Jan 2015 19:35:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3ACA6E0D53 for ; Wed, 28 Jan 2015 19:35:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3762733FAAE for ; Wed, 28 Jan 2015 19:35:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D082D10AC8 for ; Wed, 28 Jan 2015 19:35:13 +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: <1422473668.bd5f86cfa5d98e4f728eb06247c5e5b176057c50.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: bd5f86cfa5d98e4f728eb06247c5e5b176057c50 X-VCS-Branch: master Date: Wed, 28 Jan 2015 19:35:13 +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: 5905dda0-f1c1-46c8-9cf2-4a748f5751fb X-Archives-Hash: f69fc25c2ee595f37a179281c7278f72 commit: bd5f86cfa5d98e4f728eb06247c5e5b176057c50 Author: Johannes Huber gentoo org> AuthorDate: Wed Jan 28 19:34:21 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Wed Jan 28 19:34:28 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bd5f86cf [kde-plasma/plasma-desktop] Fix file collisions, bug #534792 Package-Manager: portage-2.2.15 --- kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild | 1 + kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild | 1 + kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild index 67b4553..3fa356f 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild @@ -91,6 +91,7 @@ RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) $(add_kdeplasma_dep kio-extras) sys-apps/accountsservice + !kde-apps/kcontrol !kde-base/attica !kde-base/kcontrol !kde-base/kdepasswd diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild index 3db19d2..89e8a33 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild @@ -91,6 +91,7 @@ RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) $(add_kdeplasma_dep kio-extras) sys-apps/accountsservice + !kde-apps/kcontrol !kde-base/attica !kde-base/kcontrol !kde-base/kdepasswd diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index e0b8c3d..6701a83 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -92,6 +92,7 @@ RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) $(add_kdeplasma_dep kio-extras) sys-apps/accountsservice + !kde-apps/kcontrol !kde-base/attica !kde-base/kcontrol !kde-base/kdepasswd