From: Johannes Huber Date: Thu, 13 Aug 2015 21:05:20 +0000 (+0200) Subject: kde-frameworks/kdelibs4support: Fix file collision X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66b8b487842af934cd793803eb0a64e2176bfabd;p=gentoo.git 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 --- diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild index 56823bab7614..fab09ba227b7 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 56823bab7614..fab09ba227b7 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)