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 67889138A1A for ; Sat, 17 Jan 2015 19:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48675E0982; Sat, 17 Jan 2015 19:10:34 +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 BC8A1E0982 for ; Sat, 17 Jan 2015 19:10:32 +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 8FFD23407A7 for ; Sat, 17 Jan 2015 19:10:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8887FCB9 for ; Sat, 17 Jan 2015 19:10:27 +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: <1421521401.d536e50ce2d1a3bb98bc9f597324d4f4662ef280.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.1.2.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.1.95.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: d536e50ce2d1a3bb98bc9f597324d4f4662ef280 X-VCS-Branch: master Date: Sat, 17 Jan 2015 19:10:27 +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: 0fcb0e5f-bfaa-4b45-a005-d1230e8b3421 X-Archives-Hash: 8b0a488fc45231401caf3b1c5de9f72d commit: d536e50ce2d1a3bb98bc9f597324d4f4662ef280 Author: Johannes Huber gentoo org> AuthorDate: Sat Jan 17 19:03:21 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jan 17 19:03:21 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d536e50c [kde-plasma/plasma-desktop] Fix file collisions with kde-base/plasma-desktop Package-Manager: portage-2.2.15 --- kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild | 16 ++++++++-------- kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild | 16 ++++++++-------- kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild index 3608ec3..ea6aa09 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild @@ -89,14 +89,14 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) sys-apps/accountsservice - !kde-base/attica:4 - !kde-base/kcontrol:4 - !kde-apps/knetattach:4[handbook] - !kde-base/knetattach:4[handbook] - !kde-base/kdepasswd:4 - !kde-base/solid-actions-kcm:4 - !kde-base/plasma-workspace:4 - !kde-base/systemsettings:4 + !kde-base/attica + !kde-base/kcontrol + !kde-base/kdepasswd + !kde-apps/knetattach[handbook] + !kde-base/plasma-desktop + !kde-base/plasma-workspace + !kde-base/solid-actions-kcm + !kde-base/systemsettings " DEPEND="${COMMON_DEPEND} x11-proto/xproto diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild index cee79aa..78555ea 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild @@ -90,14 +90,14 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) sys-apps/accountsservice - !kde-base/attica:4 - !kde-base/kcontrol:4 - !kde-apps/knetattach:4[handbook] - !kde-base/knetattach:4[handbook] - !kde-base/kdepasswd:4 - !kde-base/solid-actions-kcm:4 - !kde-base/plasma-workspace:4 - !kde-base/systemsettings:4 + !kde-base/attica + !kde-base/kcontrol + !kde-base/kdepasswd + !kde-base/knetattach[handbook] + !kde-base/plasma-desktop + !kde-base/plasma-workspace + !kde-base/solid-actions-kcm + !kde-base/systemsettings " DEPEND="${COMMON_DEPEND} x11-proto/xproto diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index 77e89f1..7beb6c2 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -90,14 +90,14 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) sys-apps/accountsservice - !kde-base/attica:4 - !kde-base/kcontrol:4 - !kde-apps/knetattach:4[handbook] - !kde-base/knetattach:4[handbook] - !kde-base/kdepasswd:4 - !kde-base/solid-actions-kcm:4 - !kde-base/plasma-workspace:4 - !kde-base/systemsettings:4 + !kde-base/attica + !kde-base/kcontrol + !kde-base/kdepasswd + !kde-base/knetattach[handbook] + !kde-base/plasma-desktop + !kde-base/plasma-workspace + !kde-base/solid-actions-kcm + !kde-base/systemsettings " DEPEND="${COMMON_DEPEND} x11-proto/xproto