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 9AEBB138A1A for ; Sun, 18 Jan 2015 11:52:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3006BE0907; Sun, 18 Jan 2015 11:52:03 +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 D77BCE0907 for ; Sun, 18 Jan 2015 11:52:02 +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 248873406BA for ; Sun, 18 Jan 2015 11:52:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5FF7FD6F for ; Sun, 18 Jan 2015 11:52:00 +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: <1421581909.6c15a9cd4bb166a08b324feca10171ff4407ba9d.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/baloo-widgets/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild X-VCS-Directories: kde-plasma/baloo-widgets/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 6c15a9cd4bb166a08b324feca10171ff4407ba9d X-VCS-Branch: master Date: Sun, 18 Jan 2015 11:52:00 +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: 5fce86f2-0dc5-4b53-94aa-86550c51beec X-Archives-Hash: aba6cc39e8270fa3a29c5dc5ec06f641 commit: 6c15a9cd4bb166a08b324feca10171ff4407ba9d Author: Johannes Huber gentoo org> AuthorDate: Sun Jan 18 11:51:49 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sun Jan 18 11:51:49 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6c15a9cd [kde-plasma/baloo-widgets] Fix file collisions with kde-base/baloo-widgets:5 Package-Manager: portage-2.2.15 --- kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild b/kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild index 2f3c75e..f3398f8 100644 --- a/kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild +++ b/kde-plasma/baloo-widgets/baloo-widgets-9999.ebuild @@ -23,4 +23,6 @@ DEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-base/baloo-widgets:5 +"