| 1 |
commit: c1cc5f76f0bbb3721a82b249165af594d079de62 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 17 11:30:47 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 17 11:52:44 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1cc5f76 |
| 7 |
|
| 8 |
kde-apps/konqueror: Allow all slots of kde-apps/k{editbookmarks,find} |
| 9 |
|
| 10 |
Fix file collision with kde-apps/keditbookmarks:5 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/4435 |
| 14 |
|
| 15 |
.../{konqueror-16.08.3.ebuild => konqueror-16.08.3-r1.ebuild} | 10 ++++++---- |
| 16 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/konqueror/konqueror-16.08.3.ebuild b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild |
| 19 |
similarity index 90% |
| 20 |
rename from kde-apps/konqueror/konqueror-16.08.3.ebuild |
| 21 |
rename to kde-apps/konqueror/konqueror-16.08.3-r1.ebuild |
| 22 |
index a554744e689..eb82291baf4 100644 |
| 23 |
--- a/kde-apps/konqueror/konqueror-16.08.3.ebuild |
| 24 |
+++ b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2016 Gentoo Foundation |
| 27 |
+# Copyright 1999-2017 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
@@ -27,13 +27,12 @@ DEPEND=" |
| 32 |
|
| 33 |
# bug #544630: evince[nsplugin] crashes konqueror |
| 34 |
RDEPEND="${DEPEND} |
| 35 |
- $(add_kdeapps_dep kfind) |
| 36 |
+ kde-apps/kfind:* |
| 37 |
$(add_kdeapps_dep kfmclient) |
| 38 |
$(add_kdeapps_dep kurifilter-plugins) |
| 39 |
- bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) |
| 40 |
+ bookmarks? ( kde-apps/keditbookmarks:* ) |
| 41 |
filemanager? ( |
| 42 |
$(add_kdeapps_dep kdebase-kioslaves) |
| 43 |
- $(add_kdeapps_dep kfind) |
| 44 |
$(add_kdeapps_dep konsolepart) |
| 45 |
!kde-apps/dolphin:4 |
| 46 |
) |
| 47 |
@@ -63,6 +62,9 @@ src_prepare() { |
| 48 |
|
| 49 |
kde4-meta_src_prepare |
| 50 |
|
| 51 |
+ # Avoid doc file collisions |
| 52 |
+ sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die |
| 53 |
+ |
| 54 |
use filemanager || cmake_comment_add_subdirectory dolphin |
| 55 |
|
| 56 |
# Do not install *.desktop files for kfmclient |
Archives