commit: 56465b29dec3343c508afbf33b0fe6b0df632332 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Thu Oct 8 23:22:35 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Oct 9 06:50:29 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=56465b29
kde-frameworks/kio: Add block against kde-apps/libkonq[-minimal] File collisions in the template directory, see also: https://quickgit.kde.org/?p=kio.git&a=commit&h=1b98a313983b75f3340639e5cd9519c56fca7113 Package-Manager: portage-2.2.22 kde-frameworks/kio/kio-9999.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index a6aa39f..91d7b8c 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -13,7 +13,7 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="acl kerberos X" -RDEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kbookmarks) $(add_frameworks_dep kcodecs) @@ -49,7 +49,7 @@ RDEPEND=" kerberos? ( virtual/krb5 ) X? ( dev-qt/qtx11extras:5 ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kdoctools) dev-qt/qtconcurrent:5 test? ( sys-libs/zlib ) @@ -62,6 +62,9 @@ DEPEND="${RDEPEND} PDEPEND=" $(add_frameworks_dep kded) " +RDEPEND="${COMMON_DEPEND} + !kde-apps/libkonq[-minimal(-)] +" # tests hang RESTRICT="test"
