kde-apps/konqueror: Allow all slots of kde-apps/k{editbookmarks,find}

Fix file collision with kde-apps/keditbookmarks:5

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4435

diff --git a/kde-apps/konqueror/konqueror-16.08.3.ebuild b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
similarity index 90%
rename from kde-apps/konqueror/konqueror-16.08.3.ebuild
rename to kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
index a554744e6897ae2b390fd77a690bba7e4783ddd7..eb82291baf4e28b0bc75656b3c1f2664099cd932 100644 (file)
--- a/kde-apps/konqueror/konqueror-16.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,13 +27,12 @@ DEPEND="
 
 # bug #544630: evince[nsplugin] crashes konqueror
 RDEPEND="${DEPEND}
-       $(add_kdeapps_dep kfind)
+       kde-apps/kfind:*
        $(add_kdeapps_dep kfmclient)
        $(add_kdeapps_dep kurifilter-plugins)
-       bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+       bookmarks? ( kde-apps/keditbookmarks:* )
        filemanager? (
                $(add_kdeapps_dep kdebase-kioslaves)
-               $(add_kdeapps_dep kfind)
                $(add_kdeapps_dep konsolepart)
                !kde-apps/dolphin:4
        )
@@ -63,6 +62,9 @@ src_prepare() {
 
        kde4-meta_src_prepare
 
+       # Avoid doc file collisions
+       sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die
+
        use filemanager || cmake_comment_add_subdirectory dolphin
 
        # Do not install *.desktop files for kfmclient