From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D5DFE1381FA for ; Fri, 23 May 2014 12:02:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CA46E09DF; Fri, 23 May 2014 12:02:15 +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 D9AA8E09DF for ; Fri, 23 May 2014 12:02:14 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBE8F33FDF6 for ; Fri, 23 May 2014 12:02:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 691FD1818D for ; Fri, 23 May 2014 12:02:12 +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: <1400846473.d2296ff9940b6a67986dcba4f343f9802693b500.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: x11-libs/libkscreen2/ X-VCS-Repository: proj/kde X-VCS-Files: x11-libs/libkscreen2/libkscreen2-1.71.ebuild x11-libs/libkscreen2/libkscreen2-9999.ebuild X-VCS-Directories: x11-libs/libkscreen2/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: d2296ff9940b6a67986dcba4f343f9802693b500 X-VCS-Branch: master Date: Fri, 23 May 2014 12:02:12 +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: d9f65c80-1f28-4ad0-aa40-a09e03cf8369 X-Archives-Hash: 9a26291b0a08f0f0c4129586d9fed891 commit: d2296ff9940b6a67986dcba4f343f9802693b500 Author: Johannes Huber gentoo org> AuthorDate: Fri May 23 12:01:13 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri May 23 12:01:13 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2296ff9 [x11-libs/libkscreen2] Block x11-libs/libkscreen Fixes file collisions. Package-Manager: portage-2.2.10 --- x11-libs/libkscreen2/libkscreen2-1.71.ebuild | 4 +++- x11-libs/libkscreen2/libkscreen2-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild index 212b325..4b92a5d 100644 --- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild +++ b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild @@ -31,4 +31,6 @@ DEPEND=" x11-libs/libxcb x11-libs/libXrandr " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !x11-libs/libkscreen:5 +" diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild index 212b325..4b92a5d 100644 --- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild +++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild @@ -31,4 +31,6 @@ DEPEND=" x11-libs/libxcb x11-libs/libXrandr " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !x11-libs/libkscreen:5 +"