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 4537F138A1A for ; Sat, 17 Jan 2015 19:10:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA138E0976; Sat, 17 Jan 2015 19:10:33 +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 73A1AE0962 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 82C89340780 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 83778FCB3 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: <1421518886.fefc972adecf2ab11a7ae25ebb24d3be3c01f1f6.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kwin/kwin-5.1.2.ebuild kde-plasma/kwin/kwin-5.1.95.ebuild kde-plasma/kwin/kwin-9999.ebuild X-VCS-Directories: kde-plasma/kwin/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: fefc972adecf2ab11a7ae25ebb24d3be3c01f1f6 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: 03327a75-55ca-4632-9062-340dc1e1d43d X-Archives-Hash: cdbee3615d03a6fc8d76e387328f93f0 commit: fefc972adecf2ab11a7ae25ebb24d3be3c01f1f6 Author: Johannes Huber gentoo org> AuthorDate: Sat Jan 17 18:21:26 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jan 17 18:21:26 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fefc972a [kde-plasma/kwin] Fix file collision with kde-base/kwin Package-Manager: portage-2.2.15 --- kde-plasma/kwin/kwin-5.1.2.ebuild | 4 ++-- kde-plasma/kwin/kwin-5.1.95.ebuild | 4 ++-- kde-plasma/kwin/kwin-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kde-plasma/kwin/kwin-5.1.2.ebuild b/kde-plasma/kwin/kwin-5.1.2.ebuild index 1bf0839..311d704 100644 --- a/kde-plasma/kwin/kwin-5.1.2.ebuild +++ b/kde-plasma/kwin/kwin-5.1.2.ebuild @@ -60,8 +60,8 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - !kde-base/kwin:4 - !kde-base/systemsettings:4 + !kde-base/kwin + !kde-base/systemsettings " DEPEND="${COMMON_DEPEND} dev-qt/designer:5 diff --git a/kde-plasma/kwin/kwin-5.1.95.ebuild b/kde-plasma/kwin/kwin-5.1.95.ebuild index 31e372f..d901379 100644 --- a/kde-plasma/kwin/kwin-5.1.95.ebuild +++ b/kde-plasma/kwin/kwin-5.1.95.ebuild @@ -61,8 +61,8 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - !kde-base/kwin:4 - !kde-base/systemsettings:4 + !kde-base/kwin + !kde-base/systemsettings " DEPEND="${COMMON_DEPEND} dev-qt/designer:5 diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild index 26fd031..a998fcf 100644 --- a/kde-plasma/kwin/kwin-9999.ebuild +++ b/kde-plasma/kwin/kwin-9999.ebuild @@ -61,8 +61,8 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - !kde-base/kwin:4 - !kde-base/systemsettings:4 + !kde-base/kwin + !kde-base/systemsettings " DEPEND="${COMMON_DEPEND} dev-qt/designer:5