diff options
| author |   Johannes Huber <johu@gentoo.org> | 2015-08-13 23:05:20 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-08-13 23:05:32 +0200 |
| commit | 66b8b487842af934cd793803eb0a64e2176bfabd (patch) | |
| tree | 886aa29103d2ac9a27cfee791a41d37859777eef /kde-frameworks/kdelibs4support | |
| parent | dev-vcs/git-imerge: initial import of version 0.7.0 (diff) | |
| download | gentoo-66b8b487842af934cd793803eb0a64e2176bfabd.tar.gz gentoo-66b8b487842af934cd793803eb0a64e2176bfabd.tar.bz2 gentoo-66b8b487842af934cd793803eb0a64e2176bfabd.zip | |
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
Diffstat (limited to 'kde-frameworks/kdelibs4support')
| -rw-r--r-- | kde-frameworks/kdelibs4support/kdelibs4support-5.12.0.ebuild | 1 | ||||
| -rw-r--r-- | kde-frameworks/kdelibs4support/kdelibs4support-5.13.0.ebuild | 1 |
2 files changed, 2 insertions, 0 deletions
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) |