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 3604E1386F3 for ; Thu, 13 Aug 2015 21:03:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01FAB14281; Thu, 13 Aug 2015 21:03:31 +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 9255514281 for ; Thu, 13 Aug 2015 21:03:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BD93340901 for ; Thu, 13 Aug 2015 21:03:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95468124 for ; Thu, 13 Aug 2015 21:03:26 +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: <1439499932.66b8b487842af934cd793803eb0a64e2176bfabd.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdelibs4support/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild kde-frameworks/kdelibs4support/kdelibs4support-5.13.0.ebuild X-VCS-Directories: kde-frameworks/kdelibs4support/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 66b8b487842af934cd793803eb0a64e2176bfabd X-VCS-Branch: master Date: Thu, 13 Aug 2015 21:03:26 +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: bd8b7eb7-2435-427a-ae25-d263356c56f8 X-Archives-Hash: 011f6f49f32f9d20242e69ebcd11ffb5 commit: 66b8b487842af934cd793803eb0a64e2176bfabd Author: Johannes Huber gentoo org> AuthorDate: Thu Aug 13 21:05:20 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Aug 13 21:05:32 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b8b487 kde-frameworks/kdelibs4support: Fix file collision By blocking kde-apps/kcontrol[handbook]. Reported in #gentoo-kde by glemigh. Package-Manager: portage-2.2.20.1 kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild | 1 + kde-frameworks/kdelibs4support/kdelibs4support-5.13.0.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild index 56823ba..fab09ba 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild @@ -61,6 +61,7 @@ RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kinit) $(add_frameworks_dep kitemmodels) dev-qt/qtxml:5 + !kde-apps/kcontrol[handbook] " DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kdoctools) diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.13.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.13.0.ebuild index 56823ba..fab09ba 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.13.0.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.13.0.ebuild @@ -61,6 +61,7 @@ RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kinit) $(add_frameworks_dep kitemmodels) dev-qt/qtxml:5 + !kde-apps/kcontrol[handbook] " DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kdoctools)