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 D01F6138A1A for ; Sat, 17 Jan 2015 19:10:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55E65E0986; 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 DDE6BE0984 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 0222F340775 for ; Sat, 17 Jan 2015 19:10:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94114FCB4 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: <1421518990.b553b3635f2bad974a7bb1bf960b4c0147ff7c6d.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kinfocenter/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild kde-plasma/kinfocenter/kinfocenter-9999.ebuild X-VCS-Directories: kde-plasma/kinfocenter/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: b553b3635f2bad974a7bb1bf960b4c0147ff7c6d 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: c33f2861-75ce-4ffd-9881-94a04df0f87f X-Archives-Hash: a63960cc9e37bd59506c2b49669cf531 commit: b553b3635f2bad974a7bb1bf960b4c0147ff7c6d Author: Johannes Huber gentoo org> AuthorDate: Sat Jan 17 18:23:10 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jan 17 18:23:10 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b553b363 [kde-plasma/kinfocenter] Fix file collison with kde-base/kinfocenter Package-Manager: portage-2.2.15 --- kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild | 4 ++-- kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild | 4 ++-- kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild index 6561b17..91cb219 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.1.2.ebuild @@ -48,8 +48,8 @@ RDEPEND=" samba? ( net-fs/samba[server(+)] ) wayland? ( $(add_kdeplasma_dep kwayland) ) X? ( x11-libs/libX11 ) - !kde-base/kcontrol:4 - !kde-base/kinfocenter:4 + !kde-base/kcontrol + !kde-base/kinfocenter " DEPEND="${RDEPEND} $(add_frameworks_dep plasma) diff --git a/kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild index 6561b17..91cb219 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.1.95.ebuild @@ -48,8 +48,8 @@ RDEPEND=" samba? ( net-fs/samba[server(+)] ) wayland? ( $(add_kdeplasma_dep kwayland) ) X? ( x11-libs/libX11 ) - !kde-base/kcontrol:4 - !kde-base/kinfocenter:4 + !kde-base/kcontrol + !kde-base/kinfocenter " DEPEND="${RDEPEND} $(add_frameworks_dep plasma) diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild index 936f5ff..c1fd54a 100644 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild @@ -48,8 +48,8 @@ RDEPEND=" samba? ( net-fs/samba[server(+)] ) wayland? ( $(add_kdeplasma_dep kwayland) ) X? ( x11-libs/libX11 ) - !kde-base/kcontrol:4 - !kde-base/kinfocenter:4 + !kde-base/kcontrol + !kde-base/kinfocenter " DEPEND="${RDEPEND} $(add_frameworks_dep plasma)